Merge "drm/msm/sde: check with cp properties before msm properties"