Merge "drm/msm: update rsc mode_2 entry failure sequence"