drm/ssd130x: Do not call drm_atomic_add_affected_planes()
authorJavier Martinez Canillas <javierm@redhat.com>
Tue, 11 Oct 2022 16:51:35 +0000 (18:51 +0200)
committerJavier Martinez Canillas <javierm@redhat.com>
Thu, 13 Oct 2022 07:17:04 +0000 (09:17 +0200)
There's no need to add planes to the atomic state. Remove the call
to drm_atomic_add_affected_planes() from ssd130x.

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 ssd130x. It's also too late, as the atomic_check()
of the added planes will not be called before the commit.

Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20221011165136.469750-4-javierm@redhat.com
drivers/gpu/drm/solomon/ssd130x.c

index 57e48355c008cd3bc2047101d5a8d1cbb3eb199d..0d4ab65233dbdf67b273ac63190198abb5a36e48 100644 (file)
@@ -649,17 +649,11 @@ static int ssd130x_crtc_helper_atomic_check(struct drm_crtc *crtc,
                                            struct drm_atomic_state *new_state)
 {
        struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(new_state, crtc);
-       int ret;
 
        if (!new_crtc_state->enable)
-               goto out;
-
-       ret = drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
-       if (ret)
-               return ret;
+               return 0;
 
-out:
-       return drm_atomic_add_affected_planes(new_state, crtc);
+       return drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
 }
 
 /*