diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-09 09:12:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-09 09:12:45 +1000 |
| commit | e1ef6f71e347655f3ffbcc40d7ced8ea754114b7 (patch) | |
| tree | f215d9e1d03143204615407ec8fedb4aa5548fbc | |
| parent | a121103c922847ba5010819a3f250f1f7fc84ab8 (diff) | |
| parent | aebe55c2d4b998741c0847ace1b4af47d73c763b (diff) | |
| download | aspeed-e1ef6f71e347655f3ffbcc40d7ced8ea754114b7.tar.gz | |
Merge tag 'drm-misc-fixes-2017-01-04' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
single drm fix.
* tag 'drm-misc-fixes-2017-01-04' of git://anongit.freedesktop.org/git/drm-misc:
drm: Clean up planes in atomic commit helper failure path
| -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; + } } /* |