History

drm/i915: Remove engine->execlist_lock

The execlist_lock is now completely subsumed by the engine->timeline->lock, and so we can remove the redundant layer of locking.

Chris Wilson committed 10 years ago

Commit 663f71e1 parent d55ac5b5 files · +11 −10Browse files

Unified · Split

5 files
  1. drivers/gpu/drm/i915/i915_debugfs.c +2 −2
  2. drivers/gpu/drm/i915/i915_gem.c +6 −2
  3. drivers/gpu/drm/i915/intel_engine_cs.c +0 −1
  4. drivers/gpu/drm/i915/intel_lrc.c +3 −4
  5. drivers/gpu/drm/i915/intel_ringbuffer.h +0 −1
drivers/gpu/drm/i915/i915_debugfs.c+2−2
@@ -3256,11 +3256,11 @@ static int i915_engine_info(struct seq_file *m, void *unused) · 3255 unmodified lines
32563256 seq_printf(m, "\t\tELSP[1] idle\n");
32573257 rcu_read_unlock();
32583258
3259− spin_lock_irq(&engine->execlist_lock);
3259+ spin_lock_irq(&engine->timeline->lock);
32603260 list_for_each_entry(rq, &engine->execlist_queue, execlist_link) {
32613261 print_request(m, rq, "\t\tQ ");
32623262 }
3263− spin_unlock_irq(&engine->execlist_lock);
3263+ spin_unlock_irq(&engine->timeline->lock);
32643264 } else if (INTEL_GEN(dev_priv) > 6) {
32653265 seq_printf(m, "\tPP_DIR_BASE: 0x%08x\n",
32663266 I915_READ(RING_PP_DIR_BASE(engine)));
drivers/gpu/drm/i915/i915_gem.c+6−2
@@ -2717,12 +2717,16 @@ static void i915_gem_cleanup_engine(struct intel_engine_cs *engine) · 2716 unmodified lines
27172717 */
27182718
27192719 if (i915.enable_execlists) {
2720− spin_lock(&engine->execlist_lock);
2720+ unsigned long flags;
2721+
2722+ spin_lock_irqsave(&engine->timeline->lock, flags);
2723+
27212724 INIT_LIST_HEAD(&engine->execlist_queue);
27222725 i915_gem_request_put(engine->execlist_port[0].request);
27232726 i915_gem_request_put(engine->execlist_port[1].request);
27242727 memset(engine->execlist_port, 0, sizeof(engine->execlist_port));
2725− spin_unlock(&engine->execlist_lock);
2728+
2729+ spin_unlock_irqrestore(&engine->timeline->lock, flags);
27262730 }
27272731 }
27282732
drivers/gpu/drm/i915/intel_engine_cs.c+0−1
@@ -237,7 +237,6 @@ static void intel_engine_init_timeline(struct intel_engine_cs *engine) · 236 unmodified lines
237237 void intel_engine_setup_common(struct intel_engine_cs *engine)
238238 {
239239 INIT_LIST_HEAD(&engine->execlist_queue);
240− spin_lock_init(&engine->execlist_lock);
241240
242241 intel_engine_init_timeline(engine);
243242 intel_engine_init_hangcheck(engine);
drivers/gpu/drm/i915/intel_lrc.c+3−4
@@ -471,7 +471,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 470 unmodified lines
471471 */
472472
473473 spin_lock_irqsave(&engine->timeline->lock, flags);
474− spin_lock(&engine->execlist_lock);
475474 list_for_each_entry(cursor, &engine->execlist_queue, execlist_link) {
476475 /* Can we combine this request with the current port? It has to
477476 * be the same context/ringbuffer and not have any exceptions
@@ -524,7 +523,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 46 unmodified lines
524523
525524 i915_gem_request_assign(&port->request, last);
526525 }
527− spin_unlock(&engine->execlist_lock);
528526 spin_unlock_irqrestore(&engine->timeline->lock, flags);
529527
530528 if (submit)
@@ -633,13 +631,14 @@ static void execlists_submit_request(struct drm_i915_gem_request *request) · 102 unmodified lines
633631 struct intel_engine_cs *engine = request->engine;
634632 unsigned long flags;
635633
636− spin_lock_irqsave(&engine->execlist_lock, flags);
634+ /* Will be called from irq-context when using foreign fences. */
635+ spin_lock_irqsave(&engine->timeline->lock, flags);
637636
638637 list_add_tail(&request->execlist_link, &engine->execlist_queue);
639638 if (execlists_elsp_idle(engine))
640639 tasklet_hi_schedule(&engine->irq_tasklet);
641640
642− spin_unlock_irqrestore(&engine->execlist_lock, flags);
641+ spin_unlock_irqrestore(&engine->timeline->lock, flags);
643642 }
644643
645644 int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request)
drivers/gpu/drm/i915/intel_ringbuffer.h+0−1
@@ -335,7 +335,6 @@ struct intel_engine_cs { · 334 unmodified lines
335335
336336 /* Execlists */
337337 struct tasklet_struct irq_tasklet;
338− spinlock_t execlist_lock; /* used inside tasklet, use spin_lock_bh */
339338 struct execlist_port {
340339 struct drm_i915_gem_request *request;
341340 unsigned int count;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t