Commit a308622f authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman

drm/imx: ignore plane updates on disabled crtcs

[ Upstream commit 4fb873c9 ]

This patch fixes backtraces like the following when sending SIGKILL to a
process with a currently pending plane update:

    [drm:ipu_plane_atomic_check] CRTC should be enabled
    [drm:drm_framebuffer_remove] *ERROR* failed to commit
    ------------[ cut here ]------------
    WARNING: CPU: 3 PID: 63 at drivers/gpu/drm/drm_framebuffer.c:926 drm_framebuffer_remove+0x47c/0x498
    atomic remove_fb failed with -22
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2e0e1f9a
...@@ -375,9 +375,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane, ...@@ -375,9 +375,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
if (ret) if (ret)
return ret; return ret;
/* CRTC should be enabled */ /* nothing to check when disabling or disabled */
if (!crtc_state->enable) if (!crtc_state->enable)
return -EINVAL; return 0;
switch (plane->type) { switch (plane->type) {
case DRM_PLANE_TYPE_PRIMARY: case DRM_PLANE_TYPE_PRIMARY:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment