Skip to contentSkip to conversation

Patch "drm/i915: Clear ret before unbinding in i915_gem_evict_something()" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 30, 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/i915: Clear ret before unbinding in i915_gem_evict_something()

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-i915-clear-ret-before-unbinding-in-i915_gem_evict_something.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 e88893fea17996018b2d68a22e677ea04f3baadf Mon Sep 17 00:00:00 2001

From: Chris Wilson <[email protected]>
Date: Thu, 5 Jan 2017 15:59:40 +0000
Subject: drm/i915: Clear ret before unbinding in i915_gem_evict_something()

From: Chris Wilson <[email protected]>

commit e88893fea17996018b2d68a22e677ea04f3baadf upstream.

Missed when rebasing patches, I failed to set ret to zero before starting the unbind loop (which depends upon ret being zero).

Fixes 9332f3b1b99a ("drm/i915: Combine loops within i915_gem_evict_something")
Cc Matthew Auld <[email protected]>
(cherry picked from commit 121dfbb2a2ef1c5f49e15c38ccc47ff0beb59446)
---
 drivers/gpu/drm/i915/i915_gem_evict.c |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_gem_evict.c +1 -0
@@ -194,6 +194,7 @@ found:
 	}
 
 	/* Unbinding will emit any required flushes */
+	ret = 0;
 	while (!list_empty(&eviction_list)) {
 		vma = list_first_entry(&eviction_list,
 				       struct i915_vma,

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

queue-4.9/drm-i915-clear-ret-before-unbinding-in-i915_gem_evict_something.patch queue-4.9/drm-i915-prevent-crash-with-.disable_display-parameter.patch queue-4.9/drm-i915-don-t-leak-edid-in-intel_crt_detect_ddc.patch