diff options
| author | Eric Anholt <eric@anholt.net> | 2008-12-10 19:09:41 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-12-29 08:47:25 +0100 |
| commit | b117763627ef4d24086801dd5f74c9eb2f487790 (patch) | |
| tree | 3adf4f6518cd5b69b74c7d858b941505463237a4 /drivers/gpu | |
| parent | drm/i915: Fix fbcon setup to align display pitch to 64b. (diff) | |
| download | linux-b117763627ef4d24086801dd5f74c9eb2f487790.tar.xz linux-b117763627ef4d24086801dd5f74c9eb2f487790.zip | |
drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().
We haven't seen this in practice, but it was visible when looking at a bug
report from when i915_gem_evict_everything() was broken and would always
return error.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c4ccaf3b3c7f..6a288a758385 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2498,6 +2498,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, /* unpin all of our buffers */ for (i = 0; i < pinned; i++) i915_gem_object_unpin(object_list[i]); + pinned = 0; /* evict everyone we can from the aperture */ ret = i915_gem_evict_everything(dev); |