diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-02-11 10:27:28 +0000 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-02-15 16:10:18 +0000 |
commit | 3f441b825d92af71f8f058d8a228c149915497f0 (patch) | |
tree | 28676377b65d3e693bfd9a5f9a89a33e8743f5a4 /drivers/gpu/drm/i915/i915_gem.c | |
parent | fb1a38a92ba8ed98f754aeaf9aa9ea5ea3323a23 (diff) | |
download | op-kernel-dev-3f441b825d92af71f8f058d8a228c149915497f0.zip op-kernel-dev-3f441b825d92af71f8f058d8a228c149915497f0.tar.gz |
drm/i915: Use appropriate spinlock flavour
We know this never runs from interrupt context so
don't need to use the flags variant.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e9b19bc..fc84ee5 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2970,11 +2970,9 @@ i915_gem_retire_requests(struct drm_device *dev) 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); + spin_lock_irq(&ring->execlist_lock); idle &= list_empty(&ring->execlist_queue); - spin_unlock_irqrestore(&ring->execlist_lock, flags); + spin_unlock_irq(&ring->execlist_lock); intel_execlists_retire_requests(ring); } |