From 323eeaf9275ee79705317a9aa2fc0abfe4c67afe Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 18 Feb 2009 09:44:56 -0800 Subject: [PATCH] --- yaml --- r: 131679 b: refs/heads/master c: f21289b355cee8738d80c2ae5cbd272c3f7b5689 h: refs/heads/master i: 131677: f1826c2f6040aac772c2b3933a83534835f3a1ae 131675: 67b4f2fd95ddf1e3f4e1fe4d7359b1c15114d5c2 131671: ccf90eee82cbcc3a8a9a319149661e48f420a346 131663: 94640c6a9626d3719cab950d22a664b96709ea2a 131647: ebcbb9e421d74535931391aef5133dbf91915cf9 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 40ad5e735b61..0d7c3de1f884 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5669fcacc58bf3a7386057addffd280d75380858 +refs/heads/master: f21289b355cee8738d80c2ae5cbd272c3f7b5689 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 58c789da95a3..8b50d4820389 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -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