]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: Use appropriate spinlock flavour
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Thu, 11 Feb 2016 10:27:28 +0000 (10:27 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 15 Feb 2016 16:10:18 +0000 (16:10 +0000)
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>
drivers/gpu/drm/i915/i915_gem.c

index e9b19bca13839e0fa8443ab76d462d4250bcb885..fc84ee5b7f36347ec99cba2a4f3a27a14ca0b0fe 100644 (file)
@@ -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);
                }