Skip to content

Commit 6c3d9cf

Browse files
drm/ssd130x: Do not call drm_atomic_add_affected_planes()
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 <[email protected]> Signed-off-by: Javier Martinez Canillas <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 3339aa1 commit 6c3d9cf

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/gpu/drm/solomon/ssd130x.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -649,17 +649,11 @@ static int ssd130x_crtc_helper_atomic_check(struct drm_crtc *crtc,
649649
struct drm_atomic_state *new_state)
650650
{
651651
struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(new_state, crtc);
652-
int ret;
653652

654653
if (!new_crtc_state->enable)
655-
goto out;
656-
657-
ret = drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
658-
if (ret)
659-
return ret;
654+
return 0;
660655

661-
out:
662-
return drm_atomic_add_affected_planes(new_state, crtc);
656+
return drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
663657
}
664658

665659
/*

0 commit comments

Comments
 (0)