[PATCH 69/73] execlicts-active-el

[Chris Wilson]

---
 drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 2 +-
 drivers/gpu/drm/i915/gt/selftest_execlists.c         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 507c0d9af7a1..2387cde2426c 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -2368,7 +2368,7 @@ static void sanitize_hwsp(struct intel_engine_cs *engine)
 
 static void execlists_sanitize(struct intel_engine_cs *engine)
 {
-	GEM_BUG_ON(execlists_active(&engine->execlists));
+	GEM_BUG_ON(*engine->execlists.active);
 
 	/*
 	 * Poison residual state on resume, in case the suspend didn't!
diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c
index b12bd373b109..070329be51ed 100644
--- a/drivers/gpu/drm/i915/gt/selftest_execlists.c
+++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c
@@ -606,7 +606,7 @@ static int live_hold_reset(void *arg)
 		tasklet_disable(&engine->active.tasklet);
 
 		engine->active.tasklet.func(engine->active.tasklet.data);
-		GEM_BUG_ON(execlists_active(&engine->execlists) != rq);
+		GEM_BUG_ON(*engine->execlists.active != rq);
 
 		i915_request_get(rq);
 		intel_engine_suspend_request(engine, rq);
@@ -4589,7 +4589,7 @@ static int reset_virtual_engine(struct intel_gt *gt,
 	tasklet_disable(&engine->active.tasklet);
 
 	engine->active.tasklet.func(engine->active.tasklet.data);
-	GEM_BUG_ON(execlists_active(&engine->execlists) != rq);
+	GEM_BUG_ON(*engine->execlists.active != rq);
 
 	/* Fake a preemption event; failed of course */
 	spin_lock_irq(&engine->active.lock);
-- 
2.20.1