[GIT PULL 2nd] drm-hisilicon-next for 4.7