Skip to content

Commit

Permalink
drm/omap: fix plane check when crtc is disabled
Browse files Browse the repository at this point in the history
I sometimes see:

[drm:drm_framebuffer_remove [drm]] *ERROR* failed to reset crtc ed2a6c00
when fb was deleted: -22

which comes from drm_framebuffer_remove() when it's disabling the crtc
with zeroed drm_mode_set.

The problem in omap_plane_atomic_check() is that it will use those
zeroed fields to verify if the setup is correct.

This patch makes omap_plane_atomic_check() return 0 if the crtc is
disabled.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Nov 2, 2016
1 parent fb42295 commit aaf7642
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/omapdrm/omap_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ static int omap_plane_atomic_check(struct drm_plane *plane,
if (IS_ERR(crtc_state))
return PTR_ERR(crtc_state);

if (!crtc_state->enable)
return 0;

if (state->crtc_x < 0 || state->crtc_y < 0)
return -EINVAL;

Expand Down

0 comments on commit aaf7642

Please sign in to comment.