Skip to contentSkip to conversation

Patch "drm: Clean up planes in atomic commit helper failure path" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 17, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm: Clean up planes in atomic commit helper failure path

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-clean-up-planes-in-atomic-commit-helper-failure-path.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From aebe55c2d4b998741c0847ace1b4af47d73c763b Mon Sep 17 00:00:00 2001

From: Laurent Pinchart <[email protected]>
Date: Tue, 3 Jan 2017 01:14:27 +0200
Subject: drm: Clean up planes in atomic commit helper failure path

From: Laurent Pinchart <[email protected]>

commit aebe55c2d4b998741c0847ace1b4af47d73c763b upstream.

If waiting for fences fails for blocking commits, planes must be cleaned up before returning.

Fixes f6ce410a59a4 ("drm/fence: allow fence waiting to be interrupted by userspace")
---
 drivers/gpu/drm/drm_atomic_helper.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +3 -1
@@ -1253,8 +1253,10 @@ int drm_atomic_helper_commit(struct drm_
 
 	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;
+		}
 	}
 
 	/*

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/drm-clean-up-planes-in-atomic-commit-helper-failure-path.patch queue-4.9/pinctrl-sh-pfc-r8a7795-use-lookup-function-for-bias-data.patch