Merge "drm/msm/dp: fix DP configuration programming"