drm/i915: Move breadcrumbs irq_posted up a level to engine
In the next patch, we will use the irq_posted technique for another engine interrupt, rather than use two members for the atomic updates, we can use two bits of one instead. First, we need to update the breadcrumbs to use the new common engine->irq_posted. v2: Use set_bit() rather than __set_bit() to ensure atomicity with respect to other bits in the mask Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170124151805.26146-1-chris@chris-wilson.co.uk Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
This commit is contained in:
@@ -81,7 +81,7 @@ static void irq_enable(struct intel_engine_cs *engine)
|
||||
* we still need to force the barrier before reading the seqno,
|
||||
* just in case.
|
||||
*/
|
||||
engine->breadcrumbs.irq_posted = true;
|
||||
set_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted);
|
||||
|
||||
/* Caller disables interrupts */
|
||||
spin_lock(&engine->i915->irq_lock);
|
||||
@@ -95,8 +95,6 @@ static void irq_disable(struct intel_engine_cs *engine)
|
||||
spin_lock(&engine->i915->irq_lock);
|
||||
engine->irq_disable(engine);
|
||||
spin_unlock(&engine->i915->irq_lock);
|
||||
|
||||
engine->breadcrumbs.irq_posted = false;
|
||||
}
|
||||
|
||||
static void __intel_breadcrumbs_enable_irq(struct intel_breadcrumbs *b)
|
||||
@@ -257,7 +255,8 @@ static bool __intel_engine_add_wait(struct intel_engine_cs *engine,
|
||||
* in case the seqno passed.
|
||||
*/
|
||||
__intel_breadcrumbs_enable_irq(b);
|
||||
if (READ_ONCE(b->irq_posted))
|
||||
if (test_bit(ENGINE_IRQ_BREADCRUMB,
|
||||
&engine->irq_posted))
|
||||
wake_up_process(to_wait(next)->tsk);
|
||||
}
|
||||
|
||||
@@ -610,7 +609,7 @@ void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine)
|
||||
if (intel_engine_has_waiter(engine)) {
|
||||
b->timeout = wait_timeout();
|
||||
__intel_breadcrumbs_enable_irq(b);
|
||||
if (READ_ONCE(b->irq_posted))
|
||||
if (test_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted))
|
||||
wake_up_process(b->first_wait->tsk);
|
||||
} else {
|
||||
/* sanitize the IMR and unmask any auxiliary interrupts */
|
||||
|
مرجع در شماره جدید
Block a user