diff options
| author | Thomas Daniel | 2014-11-13 11:27:05 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-19 19:16:45 +0100 |
| commit | c86ee3a9f8cddcf2e637da19d6e7c05bdea11a96 (patch) | |
| tree | 0c8485ea3924b8151f2062179fb1a7ee8bd93286 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued (diff) | |
| download | kernel-qcow2-linux-c86ee3a9f8cddcf2e637da19d6e7c05bdea11a96.tar.gz kernel-qcow2-linux-c86ee3a9f8cddcf2e637da19d6e7c05bdea11a96.tar.xz kernel-qcow2-linux-c86ee3a9f8cddcf2e637da19d6e7c05bdea11a96.zip | |
drm/i915/bdw: Clean up execlist queue items in retire_work
No longer create a work item to clean each execlist queue item.
Instead, move retired execlist requests to a queue and clean up the
items during retire_requests.
v2: Fix legacy ring path broken during overzealous cleanup
v3: Update idle detection to take execlists queue into account
v4: Grab execlist lock when checking queue state
v5: Fix leaking requests by freeing in execlists_retire_requests.
Issue: VIZ-4274
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Deepak S <deepak.s@linux.intel.com>
Reviewed-by: Akash Goel <akash.goels@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 86cf428b6c4e..2e85ef1650bf 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2800,6 +2800,15 @@ i915_gem_retire_requests(struct drm_device *dev) for_each_ring(ring, dev_priv, i) { i915_gem_retire_requests_ring(ring); idle &= list_empty(&ring->request_list); + if (i915.enable_execlists) { + unsigned long flags; + + spin_lock_irqsave(&ring->execlist_lock, flags); + idle &= list_empty(&ring->execlist_queue); + spin_unlock_irqrestore(&ring->execlist_lock, flags); + + intel_execlists_retire_requests(ring); + } } if (idle) |