Skip to content

Commit 3339aa1

Browse files
drm/simpledrm: 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 simpledrm. 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 simpledrm. 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 9cebffd commit 3339aa1

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/gpu/drm/tiny/simpledrm.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -549,17 +549,11 @@ static int simpledrm_crtc_helper_atomic_check(struct drm_crtc *crtc,
549549
struct drm_atomic_state *new_state)
550550
{
551551
struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(new_state, crtc);
552-
int ret;
553552

554553
if (!new_crtc_state->enable)
555-
goto out;
556-
557-
ret = drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
558-
if (ret)
559-
return ret;
554+
return 0;
560555

561-
out:
562-
return drm_atomic_add_affected_planes(new_state, crtc);
556+
return drm_atomic_helper_check_crtc_primary_plane(new_crtc_state);
563557
}
564558

565559
/*

0 commit comments

Comments
 (0)