]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().
authorEric Anholt <eric@anholt.net>
Wed, 10 Dec 2008 18:09:41 +0000 (10:09 -0800)
committerDave Airlie <airlied@linux.ie>
Mon, 29 Dec 2008 07:47:25 +0000 (17:47 +1000)
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>
drivers/gpu/drm/i915/i915_gem.c

index c4ccaf3b3c7f5f0bbbabb1bb259e572ab40a7923..6a288a758385f7415c036525c658e8ba1d873522 100644 (file)
@@ -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);