diff options
| author | Linus Walleij | 2018-03-18 17:48:59 +0100 |
|---|---|---|
| committer | Linus Walleij | 2018-03-18 17:48:59 +0100 |
| commit | 95260c17b27e4bdacf85022e629fb701b42cc190 (patch) | |
| tree | cfc6963180d99e5f36752ca028821aaa109e860d /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | gpio: mockup: Update Bamvors mail address (diff) | |
| parent | Linux 4.16-rc5 (diff) | |
| download | kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.gz kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.xz kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.zip | |
Merge tag 'v4.16-rc5' into devel
Linux 4.16-rc5 merged into the GPIO devel branch to resolve
a nasty conflict between fixes and devel in the RCAR driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7ece2f061b9e..e0fca035ff78 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -719,6 +719,8 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine) struct rb_node *rb; unsigned long flags; + GEM_TRACE("%s\n", engine->name); + spin_lock_irqsave(&engine->timeline->lock, flags); /* Cancel the requests on the HW and clear the ELSP tracker. */ @@ -765,6 +767,9 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine) */ clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted); + /* Mark all CS interrupts as complete */ + execlists->active = 0; + spin_unlock_irqrestore(&engine->timeline->lock, flags); } |