diff options
| author | Philipp Zabel | 2018-11-05 16:36:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-03-23 20:09:41 +0100 |
| commit | a308622febe16b1b4285975fc8f586b9636b603d (patch) | |
| tree | ebf332298777d4e9e707041d66d2b01c3116e7f0 /drivers/gpu/drm/imx | |
| parent | crypto: rockchip - update new iv to device in multiple operations (diff) | |
| download | kernel-qcow2-linux-a308622febe16b1b4285975fc8f586b9636b603d.tar.gz kernel-qcow2-linux-a308622febe16b1b4285975fc8f586b9636b603d.tar.xz kernel-qcow2-linux-a308622febe16b1b4285975fc8f586b9636b603d.zip | |
drm/imx: ignore plane updates on disabled crtcs
[ Upstream commit 4fb873c9648e383206e0a91cef9b03aa54066aca ]
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: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/imx')
| -rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 203f247d4854..a323a0db2fc1 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -375,9 +375,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane, if (ret) return ret; - /* CRTC should be enabled */ + /* nothing to check when disabling or disabled */ if (!crtc_state->enable) - return -EINVAL; + return 0; switch (plane->type) { case DRM_PLANE_TYPE_PRIMARY: |