[01/10] drm/i915/execlists: Always clear ring_pause if we do not submit
diff mbox series

Message ID 20190622212055.25782-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • [01/10] drm/i915/execlists: Always clear ring_pause if we do not submit
Related show

Commit Message

Chris Wilson June 22, 2019, 9:20 p.m. UTC
In the unlikely case (thank you CI!), we may find ourselves wanting to
issue a preemption but having no runnable requests left. In this case,
we set the semaphore before computing the preemption and so must unset
it before forgetting (or else we leave the machine busywaiting until the
next request comes along and so likely hang).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index c8a0c9b32764..efccc31887de 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -233,13 +233,18 @@  static inline u32 intel_hws_preempt_address(struct intel_engine_cs *engine)
 static inline void
 ring_set_paused(const struct intel_engine_cs *engine, int state)
 {
+	u32 *sema = &engine->status_page.addr[I915_GEM_HWS_PREEMPT];
+
+	if (*sema == state)
+		return;
+
 	/*
 	 * We inspect HWS_PREEMPT with a semaphore inside
 	 * engine->emit_fini_breadcrumb. If the dword is true,
 	 * the ring is paused as the semaphore will busywait
 	 * until the dword is false.
 	 */
-	engine->status_page.addr[I915_GEM_HWS_PREEMPT] = state;
+	*sema = state;
 	wmb();
 }
 
@@ -1243,6 +1248,8 @@  static void execlists_dequeue(struct intel_engine_cs *engine)
 		*port = execlists_schedule_in(last, port - execlists->pending);
 		memset(port + 1, 0, (last_port - port) * sizeof(*port));
 		execlists_submit_ports(engine);
+	} else {
+		ring_set_paused(engine, 0);
 	}
 }