From: Tvrtko Ursulin Date: Thu, 11 Feb 2016 10:27:28 +0000 (+0000) Subject: drm/i915: Use appropriate spinlock flavour X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3f441b825d92af71f8f058d8a228c149915497f0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e9b19bca1383..fc84ee5b7f36 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); }