Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915: Flush pending GTT writes before unbinding" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Dec 27, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 2797c4a11f373b2545c2398ccb02e362ee66a142 Mon Sep 17 00:00:00 2001

From: Chris Wilson <[email protected]>
Date: Mon, 4 Dec 2017 13:25:13 +0000
Subject: [PATCH] drm/i915: Flush pending GTT writes before unbinding

Quoted 1 line

From the shrinker paths, we want to relinquish the GPU and GGTT access to

the object, releasing the backing storage back to the system for swapout. As a part of that process we would unpin the pages, marking them for access by the CPU (for the swapout/swapin). However, if that process was interrupted after unbind the vma, we missed a flush of the inflight GGTT writes before we made that GTT space available again for reuse, with the prospect that we would redirect them to another page.

The bug dates back to the introduction of multiple GGTT vma, but the code itself dates to commit 02bef8f98d26 ("drm/i915: Unbind closed vma for i915_gem_object_unbind()").

Fixes 02bef8f98d26 ("drm/i915: Unbind closed vma for i915_gem_object_unbind()")
Fixes c5ad54cf7dd8 ("drm/i915: Use partial view in mmap fault handler")
Cc Joonas Lahtinen <[email protected]>
(cherry picked from commit 5888fc9eac3c2ff96e76aeeb865fdb46ab2d711e)
drivers/gpu/drm/i915/i915_gem.c +1 -8
index ad4050f7ab3b..18de6569d04a 100644
@@ -330,17 +330,10 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj)
 	 * must wait for all rendering to complete to the object (as unbinding
 	 * must anyway), and retire the requests.
 	 */
-	ret = i915_gem_object_wait(obj,
-				   I915_WAIT_INTERRUPTIBLE |
-				   I915_WAIT_LOCKED |
-				   I915_WAIT_ALL,
-				   MAX_SCHEDULE_TIMEOUT,
-				   NULL);
+	ret = i915_gem_object_set_to_cpu_domain(obj, false);
 	if (ret)
 		return ret;
 
-	i915_gem_retire_requests(to_i915(obj->base.dev));
-
 	while ((vma = list_first_entry_or_null(&obj->vma_list,
 					       struct i915_vma,
 					       obj_link))) {