diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2017-01-03 01:14:27 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-04 11:08:13 +0100 |
| commit | aebe55c2d4b998741c0847ace1b4af47d73c763b (patch) | |
| tree | 247be137e8262c931d0c505deea4cea997ba6542 | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| download | aspeed-aebe55c2d4b998741c0847ace1b4af47d73c763b.tar.gz | |
drm: Clean up planes in atomic commit helper failure path
If waiting for fences fails for blocking commits, planes must be cleaned
up before returning.
Cc: stable@vger.kernel.org
Fixes: f6ce410a59a4 ("drm/fence: allow fence waiting to be interrupted by userspace")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170102231427.7192-1-laurent.pinchart@ideasonboard.com
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 583f47f27b36de..34f757bcabae8d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1259,8 +1259,10 @@ int drm_atomic_helper_commit(struct drm_device *dev, if (!nonblock) { ret = drm_atomic_helper_wait_for_fences(dev, state, true); - if (ret) + if (ret) { + drm_atomic_helper_cleanup_planes(dev, state); return ret; + } } /* |