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

drivers/gpu/drm/drm_atomic_helper.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1259,9 +1259,11 @@ 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;
		}
		}

		/*
		* This is the point of no return - everything below never fails except