diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-04-14 15:06:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-04-14 15:06:21 +1000 |
| commit | 98a71d12d98dddfb55acfe28e988ee18ff2312d6 (patch) | |
| tree | d09a79460e8b84a548b482a1d03fa73681487207 /drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | |
| parent | 16e0400772c6ce07e749419794b2c78b6426f668 (diff) | |
| parent | 390d645877ffd6dcb55f162d618045b2779217b3 (diff) | |
| download | linux-98a71d12d98dddfb55acfe28e988ee18ff2312d6.tar.bz2 | |
Merge tag 'drm-msm-fixes-2022-04-13' of https://gitlab.freedesktop.org/drm/msm into drm-fixes
Some msm fixes for v5.18.
kzalloc return checks, display fix, misc locking and scheduler bug, iommu present removal.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvuTwx09MKwK68KWXqi4o7LxDGMUz1=Z7xOS+i=OV84Ug@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index 1ee824600995..c478d25f7825 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -98,7 +98,10 @@ static void mdp5_plane_reset(struct drm_plane *plane) __drm_atomic_helper_plane_destroy_state(plane->state); kfree(to_mdp5_plane_state(plane->state)); + plane->state = NULL; mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); + if (!mdp5_state) + return; __drm_atomic_helper_plane_reset(plane, &mdp5_state->base); } |