From af8848e0d9ec52bbf2e5fdc8056bba4fb5d6688e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Mar 2023 08:07:47 +0000 Subject: [PATCH] Revert "drm/msm/mdp5: Add check for kzalloc" This reverts commit 3975ea6eaffe26aec634b5c473e51dc76e73af62. It breaks the Android kernel api and was added only because of a tiny drm driver bugfix for an issue that can not ever really be hit, so it is safe to revert. Bug: 161946584 Change-Id: Iea27669f1c3b23c9fd6b4d0babc79ffb4e882814 Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c index cc60842b47e9..03d60eb09257 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c @@ -1050,10 +1050,7 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc) if (crtc->state) mdp5_crtc_destroy_state(crtc, crtc->state); - if (mdp5_cstate) - __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); - else - __drm_atomic_helper_crtc_reset(crtc, NULL); + __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); drm_crtc_vblank_reset(crtc); }