[GIT PULL] drm-vc4-fixes-2016-06-06 for 4.7