Merge "drm/msm/dp: fix controller state update during disconnect event"