drm/i915: Retire requests from i915_gem_busy_ioctl.
authorEric Anholt <eric@anholt.net>
Wed, 18 Feb 2009 17:44:56 +0000 (09:44 -0800)
committerDave Airlie <airlied@redhat.com>
Mon, 23 Feb 2009 00:06:26 +0000 (10:06 +1000)
This ensures that the user gets the latest information from the hardware
on whether the buffer is busy, potentially reducing the working set of objects
that the user chooses.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/i915/i915_gem.c

index 58c789da95a312410e9a7ad47ac7270704ae218a..8b50d48203891f40e64ffd0cfa553e19ce98767d 100644 (file)
@@ -2872,6 +2872,13 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
                return -EBADF;
        }
 
+       /* Update the active list for the hardware's current position.
+        * Otherwise this only updates on a delayed timer or when irqs are
+        * actually unmasked, and our working set ends up being larger than
+        * required.
+        */
+       i915_gem_retire_requests(dev);
+
        obj_priv = obj->driver_private;
        /* Don't count being on the flushing list against the object being
         * done.  Otherwise, a buffer left on the flushing list but not getting