Skip to contentSkip to conversation

Patch "drm/i915: Clear the in-use marker on execbuf failure" has been added to the 4.15-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2018

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/i915: Clear the in-use marker on execbuf failure

to the 4.15-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-i915-clear-the-in-use-marker-on-execbuf-failure.patch
and it can be found in the queue-4.15 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 e659d14ed48096f87a678e7ebbdf286a817b4d0e Mon Sep 17 00:00:00 2001

From: Chris Wilson <[email protected]>
Date: Mon, 19 Feb 2018 14:01:44 +0000
Subject: drm/i915: Clear the in-use marker on execbuf failure

From: Chris Wilson <[email protected]>

commit e659d14ed48096f87a678e7ebbdf286a817b4d0e upstream.

If we fail to unbind the vma (due to a signal on an active buffer that needs to be moved for the next execbuf), then we need to clear the persistent tracking state we setup for this execbuf.

Fixes c7c6e46f913b ("drm/i915: Convert execbuf to use struct-of-array packing for critical fields")

Testcase: igt/gem_fenced_exec_thrash/no-spare-fences-busy*

Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc <[email protected]> # v4.14+
(cherry picked from commit ed2f3532321083cf40e4da4e36234880e0136136)
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -0
@@ -505,6 +505,8 @@ eb_add_vma(struct i915_execbuffer *eb, u
 		list_add_tail(&vma->exec_link, &eb->unbound);
 		if (drm_mm_node_allocated(&vma->node))
 			err = i915_vma_unbind(vma);
+		if (unlikely(err))
+			vma->exec_flags = NULL;
 	}
 	return err;
 }

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

queue-4.15/drm-i915-fix-rsvd2-mask-when-out-fence-is-returned.patch queue-4.15/drm-i915-perf-fix-perf-stream-opening-lock.patch queue-4.15/drm-i915-clear-the-in-use-marker-on-execbuf-failure.patch