Commit e1ef6f71 authored by Dave Airlie's avatar Dave Airlie

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
parents a121103c aebe55c2
...@@ -1259,9 +1259,11 @@ int drm_atomic_helper_commit(struct drm_device *dev, ...@@ -1259,9 +1259,11 @@ int drm_atomic_helper_commit(struct drm_device *dev,
if (!nonblock) { if (!nonblock) {
ret = drm_atomic_helper_wait_for_fences(dev, state, true); ret = drm_atomic_helper_wait_for_fences(dev, state, true);
if (ret) if (ret) {
drm_atomic_helper_cleanup_planes(dev, state);
return ret; return ret;
} }
}
/* /*
* This is the point of no return - everything below never fails except * This is the point of no return - everything below never fails except
......
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