iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Use simpler form of spin_lock_irq(execlist_lock)

Browse Source 
We can use the simpler spinlock form to disable interrupts as we are
always outside of an irq/softirq handler.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2015-04-07 16:20:48 +01:00 committed by Daniel Vetter
parent 90e4f1592b
commit b5eba37283
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_lrc.c
View File

@ -522,7 +522,6 @@ static int execlists_context_queue(struct intel_engine_cs *ring,
{ {
struct drm_i915_gem_request *cursor; struct drm_i915_gem_request *cursor;
struct drm_i915_private *dev_priv = ring->dev->dev_private; struct drm_i915_private *dev_priv = ring->dev->dev_private;
unsigned long flags;
int num_elements = 0; int num_elements = 0;
if (to != ring->default_context) if (to != ring->default_context)
@ -549,7 +548,7 @@ static int execlists_context_queue(struct intel_engine_cs *ring,
intel_runtime_pm_get(dev_priv); intel_runtime_pm_get(dev_priv);
spin_lock_irqsave(&ring->execlist_lock, flags); spin_lock_irq(&ring->execlist_lock);
list_for_each_entry(cursor, &ring->execlist_queue, execlist_link) list_for_each_entry(cursor, &ring->execlist_queue, execlist_link)
if (++num_elements > 2) if (++num_elements > 2)
@ -575,7 +574,7 @@ static int execlists_context_queue(struct intel_engine_cs *ring,
if (num_elements == 0) if (num_elements == 0)
execlists_context_unqueue(ring); execlists_context_unqueue(ring);
spin_unlock_irqrestore(&ring->execlist_lock, flags); spin_unlock_irq(&ring->execlist_lock);
return 0; return 0;
} }
@ -960,7 +959,6 @@ void intel_execlists_retire_requests(struct intel_engine_cs *ring)
{ {
struct drm_i915_gem_request *req, *tmp; struct drm_i915_gem_request *req, *tmp;
struct drm_i915_private *dev_priv = ring->dev->dev_private; struct drm_i915_private *dev_priv = ring->dev->dev_private;
unsigned long flags;
struct list_head retired_list; struct list_head retired_list;
WARN_ON(!mutex_is_locked(&ring->dev->struct_mutex)); WARN_ON(!mutex_is_locked(&ring->dev->struct_mutex));
@ -968,9 +966,9 @@ void intel_execlists_retire_requests(struct intel_engine_cs *ring)
return; return;
INIT_LIST_HEAD(&retired_list); INIT_LIST_HEAD(&retired_list);
spin_lock_irqsave(&ring->execlist_lock, flags); spin_lock_irq(&ring->execlist_lock);
list_replace_init(&ring->execlist_retired_req_list, &retired_list); list_replace_init(&ring->execlist_retired_req_list, &retired_list);
spin_unlock_irqrestore(&ring->execlist_lock, flags); spin_unlock_irq(&ring->execlist_lock);
list_for_each_entry_safe(req, tmp, &retired_list, execlist_link) { list_for_each_entry_safe(req, tmp, &retired_list, execlist_link) {
struct intel_context *ctx = req->ctx; struct intel_context *ctx = req->ctx;