diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-28 22:35:07 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-28 22:35:07 +0100 |
| commit | bbe2e11a4b683ead070ad5823cdf756e1525b903 (patch) | |
| tree | 10c5e8c5c5dec1423954de91be41c04962ddeda1 /drivers/gpu/drm | |
| parent | 4a684a4117abd756291969336af454e8a958802f (diff) | |
| download | blackbird-op-linux-bbe2e11a4b683ead070ad5823cdf756e1525b903.tar.gz blackbird-op-linux-bbe2e11a4b683ead070ad5823cdf756e1525b903.zip | |
drm/i915: Do not return -1 from shrinker when nr_to_scan == 0
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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d4d8f888db85..7569b77fb403 100644 --- 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) { |
