diff options
| author |   Owain Ainsworth <zerooa@googlemail.com> | 2008-12-06 20:42:20 -0800 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2008-12-09 15:37:17 +1000 |
| commit | 15c35334c9b7a11f66ddf7fea9367884e1f5414f (patch) | |
| tree | 0ad186eeadf36d043251c5666825970172711bc2 /drivers/gpu | |
| parent | drm/radeon: don't actually enable the IRQ regs until irq is enabled (diff) | |
| download | linux-dev-15c35334c9b7a11f66ddf7fea9367884e1f5414f.tar.xz linux-dev-15c35334c9b7a11f66ddf7fea9367884e1f5414f.zip | |
drm/i915: Don't return error in evict_everything when we get to the end.
Returning -ENOMEM errored all the way out of execbuf, so the rendering never
occurred.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 3fde82be014f..ad672d854828 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1104,6 +1104,8 @@ i915_gem_evict_everything(struct drm_device *dev) if (ret != 0) break; } + if (ret == -ENOMEM) + return 0; return ret; } |