diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-08-07 14:10:18 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-08-07 14:10:18 -0700 |
| commit | fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7 (patch) | |
| tree | ddb47c9ee0a1d52291952e6fb8e3bfc24bd06d1d /drivers/gpu/drm/msm/msm_mdss.c | |
| parent | drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done (diff) | |
| parent | drm/msm: Disallow submit with fence id 0 (diff) | |
| download | linux-fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7.tar.gz linux-fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7.zip | |
Merge branch 'msm-fixes' into msm-next
Back-merge msm-fixes to resolve conflicts.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_mdss.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_mdss.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index c2b4cf9ad2eb..be204b2ecf6a 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -603,7 +603,6 @@ static const struct msm_mdss_data sm8550_data = { .highest_bank_bit = 3, .macrotile_mode = 1, }; - static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,mdss" }, { .compatible = "qcom,msm8998-mdss", .data = &msm8998_data }, |