Merge "drm/msm/sde: fix compilation issues in sde driver" into msm-4.8