From: Dave Airlie <airlied@redhat.com>
Date: Thu, 14 Apr 2022 05:06:21 +0000 (+1000)
Subject: Merge tag 'drm-msm-fixes-2022-04-13' of https://gitlab.freedesktop.org/drm/msm into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=98a71d12d98dddfb55acfe28e988ee18ff2312d6;p=linux.git

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
---

98a71d12d98dddfb55acfe28e988ee18ff2312d6
diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index 1ee8246009958,85ef10b888e90..c478d25f7825a
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@@ -98,7 -91,17 +98,10 @@@ static void mdp5_plane_reset(struct drm
  		__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;
 -
 -	if (plane->type == DRM_PLANE_TYPE_PRIMARY)
 -		mdp5_state->base.zpos = STAGE_BASE;
 -	else
 -		mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
 -	mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
 -
  	__drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
  }