Blob Blame History Raw
From 963a2ba2adb51f677f2be875bb516fa636eaab47 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Thu, 13 Oct 2022 13:29:18 +0200
Subject: drm/ast: Do not call drm_atomic_add_affected_planes()
Git-commit: 963a2ba2adb51f677f2be875bb516fa636eaab47
Patch-mainline: v6.2-rc1
References: jsc#PED-1465

There's no need to add planes to the atomic state. Remove the call
to drm_atomic_add_affected_planes() from ast.

On full modesets, the DRM helpers already add a CRTC's planes to the
atomic state; see drm_atomic_helper_check_modeset(). There's no reason
to call drm_atomic_add_affected_planes() unconditionally in the CRTC's
atomic_check() in ast. It's also too late, as the atomic_check() of
the added planes will not be called before the commit.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221013112923.769-4-tzimmermann@suse.de
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/ast/ast_mode.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1162,7 +1162,7 @@ static int ast_crtc_helper_atomic_check(
 		return ret;
 
 	if (!crtc_state->enable)
-		goto out;
+		return 0;
 
 	ast_state = to_ast_crtc_state(crtc_state);
 
@@ -1192,8 +1192,7 @@ static int ast_crtc_helper_atomic_check(
 	if (!succ)
 		return -EINVAL;
 
-out:
-	return drm_atomic_add_affected_planes(state, crtc);
+	return 0;
 }
 
 static void