Merge "drm/msm/sde: simplify encoder display probe logic" into msm-4.8