Merge "drm/msm/dp: fix usbpd and drm framework sequence"