projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a684a4
)
drm/i915: Do not return -1 from shrinker when nr_to_scan == 0
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 28 Oct 2010 21:35:07 +0000
(22:35 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 28 Oct 2010 21:35:07 +0000
(22:35 +0100)
The error code is only expected during the actual pruning and not during
the first measurement (nr_to_scan == 0) pass.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index
d4d8f88
..
7569b77
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem.c
+++ b/
drivers/gpu/drm/i915/i915_gem.c
@@
-4994,7
+4994,7
@@
i915_gem_inactive_shrink(struct shrinker *shrinker,
int cnt;
if (!mutex_trylock(&dev->struct_mutex))
- return
nr_to_scan ? 0 : -1
;
+ return
0
;
/* "fast-path" to count number of available objects */
if (nr_to_scan == 0) {