Merge "drm/msm: add display rsc support" into msm-4.9