Merge branch 'msm-fixes' into msm-next

Back-merge msm-fixes to resolve conflicts.

Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --cc drivers/gpu/drm/msm/msm_mdss.c
index c2b4cf9,798bd4f..be204b2
--- 1/drivers/gpu/drm/msm/msm_mdss.c
--- 2/drivers/gpu/drm/msm/msm_mdss.c
+++ b/drivers/gpu/drm/msm/msm_mdss.c
@@@ -603,11 -583,11 +603,10 @@@ static const struct msm_mdss_data sm855
        .highest_bank_bit = 3,
        .macrotile_mode = 1,
  };
--
  static const struct of_device_id mdss_dt_match[] = {
        { .compatible = "qcom,mdss" },
 -      { .compatible = "qcom,msm8998-mdss" },
 -      { .compatible = "qcom,qcm2290-mdss" },
 +      { .compatible = "qcom,msm8998-mdss", .data = &msm8998_data },
 +      { .compatible = "qcom,qcm2290-mdss", .data = &qcm2290_data },
        { .compatible = "qcom,sdm845-mdss", .data = &sdm845_data },
        { .compatible = "qcom,sc7180-mdss", .data = &sc7180_data },
        { .compatible = "qcom,sc7280-mdss", .data = &sc7280_data },