diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-11-24 03:37:45 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-11-24 03:37:47 +0300 |
| commit | fca9a80563581468b67017acc0a27a9626822600 (patch) | |
| tree | 159135981e35666ccf43de69642a32fffb63445c /drivers/gpu/drm/msm/disp/mdp5 | |
| parent | 98b1cc82c4affc16f5598d4fa14b1858671b2263 (diff) | |
| parent | 56466f653cb59a8f46e991ad1e285f43afdca7d4 (diff) | |
| download | linux-fca9a80563581468b67017acc0a27a9626822600.tar.xz | |
Merge tag 'drm-msm-fixes-2023-11-21' of https://gitlab.freedesktop.org/drm/msm into drm-fixes
Fixes for v6.7-rc3:
- Fix the VREG_CTRL_1 for 4nm CPHY to match downstream
- Remove duplicate call to drm_kms_helper_poll_init() in msm_drm_init()
- Fix the safe_lut_tbl[] for sc8280xp to match downstream
- Don't attach the drm_dp_set_subconnector_property() for eDP
- Fix to attach drm_dp_set_subconnector_property() for DP. Otherwise
there is a bootup crash on multiple targets
- Remove unnecessary NULL check left behind during cleanup
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGtkna3P3mvaF53n2ARJACaXQU+OFfShayTrsUVmqCOmNQ@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/disp/mdp5')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 11d9fc2c6bf5..ec933d597e20 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -844,8 +844,7 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) return 0; fail: - if (mdp5_kms) - mdp5_destroy(mdp5_kms); + mdp5_destroy(mdp5_kms); return ret; } |