From: Rob Clark Date: Mon, 7 Aug 2023 21:10:18 +0000 (-0700) Subject: Merge branch 'msm-fixes' into msm-next X-Git-Tag: v6.6-rc1~136^2~2^2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'msm-fixes' into msm-next Back-merge msm-fixes to resolve conflicts. Signed-off-by: Rob Clark --- fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7 diff --cc drivers/gpu/drm/msm/msm_mdss.c index c2b4cf9ad2ebc,798bd4f3b6621..be204b2ecf6ac --- a/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 },