Merge "drm/msm: update rsc timers back to recommended settings"