diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-02-19 16:26:04 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-02-19 16:26:04 +1100 |
| commit | 23d7525eb372c8bfe39f4b477a81e33f520027dc (patch) | |
| tree | 221c2683317487291b28453715c8cce5a11d907c /sys/dev | |
| parent | c076f319f28ae3d508d0fe70f8196b7a8e42ac9d (diff) | |
only retire requests on the ring our object belongs to in the busy ioctl
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915_gem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c index c7d750ea541..1cd1768b926 100644 --- a/sys/dev/pci/drm/i915_gem.c +++ b/sys/dev/pci/drm/i915_gem.c @@ -1898,7 +1898,6 @@ int i915_gem_busy_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { - struct inteldrm_softc *dev_priv = dev->dev_private; struct drm_i915_gem_busy *args = data; struct drm_i915_gem_object *obj; int ret = 0; @@ -1926,7 +1925,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, * only updated on a delayed timer. Updating now reduces * working set size. */ - i915_gem_retire_requests(dev_priv); + i915_gem_retire_requests_ring(obj->ring); args->busy = obj->active; } |