OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79b11b6
)
drm/i915: Clear ret before unbinding in i915_gem_evict_something()
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 5 Jan 2017 15:59:40 +0000
(15:59 +0000)
committer
Jani Nikula
<jani.nikula@intel.com>
Thu, 12 Jan 2017 08:15:44 +0000
(10:15 +0200)
Missed when rebasing patches, I failed to set ret to zero before
starting the unbind loop (which depends upon ret being zero).
Reported-by: Matthew Auld <matthew.william.auld@gmail.com>
Fixes:
9332f3b1b99a
("drm/i915: Combine loops within i915_gem_evict_something")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Link:
http://patchwork.freedesktop.org/patch/msgid/20170105155940.10033-1-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.william.auld@gmail.com>
Cc: <stable@vger.kernel.org> # v4.9+
(cherry picked from commit
121dfbb2a2ef1c5f49e15c38ccc47ff0beb59446
)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem_evict.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem_evict.c
b/drivers/gpu/drm/i915/i915_gem_evict.c
index
bd08814
..
d534a31
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/
drivers/gpu/drm/i915/i915_gem_evict.c
@@
-199,6
+199,7
@@
found:
}
/* Unbinding will emit any required flushes */
+ ret = 0;
while (!list_empty(&eviction_list)) {
vma = list_first_entry(&eviction_list,
struct i915_vma,