Merge remote-tracking branch 'drm-msm/msm-next'

diff --cc drivers/gpu/drm/drm_atomic.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_uapi.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_ctrl.c
Simple merge