All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Revert "drm/i915: Avoid waking the engines just to check if they are idle"
@ 2019-02-27 20:46 Chris Wilson
  2019-02-27 20:46 ` [PATCH 2/2] drm/i915: Report engines are idle if already parked Chris Wilson
                   ` (6 more replies)
  0 siblings, 7 replies; 11+ messages in thread
From: Chris Wilson @ 2019-02-27 20:46 UTC (permalink / raw)
  To: intel-gfx; +Cc: Mika Kuoppala

This reverts commit 0b702dca26580e3bbfbbaf22dfc29280b6263414.

CI reports that this is not as reliable as it first appears, with
failures starting to sporadically occur in selftests.

Fixes: 0b702dca2658 ("drm/i915: Avoid waking the engines just to check if they are idle")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_engine_cs.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 4f244019560d..b7b626195eda 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -968,7 +968,6 @@ static bool ring_is_idle(struct intel_engine_cs *engine)
 {
 	struct drm_i915_private *dev_priv = engine->i915;
 	intel_wakeref_t wakeref;
-	unsigned long flags;
 	bool idle = true;
 
 	if (I915_SELFTEST_ONLY(!engine->mmio_base))
@@ -979,19 +978,15 @@ static bool ring_is_idle(struct intel_engine_cs *engine)
 	if (!wakeref)
 		return true;
 
-	spin_lock_irqsave(&dev_priv->uncore.lock, flags);
+	/* First check that no commands are left in the ring */
+	if ((I915_READ_HEAD(engine) & HEAD_ADDR) !=
+	    (I915_READ_TAIL(engine) & TAIL_ADDR))
+		idle = false;
 
-	/*
-	 * Check that no commands are left in the ring.
-	 *
-	 * If the engine is not awake, both reads return 0 as we do so without
-	 * forcewake.
-	 */
-	if ((I915_READ_FW(RING_HEAD(engine->mmio_base)) & HEAD_ADDR) !=
-	    (I915_READ_FW(RING_TAIL(engine->mmio_base)) & TAIL_ADDR))
+	/* No bit for gen2, so assume the CS parser is idle */
+	if (INTEL_GEN(dev_priv) > 2 && !(I915_READ_MODE(engine) & MODE_IDLE))
 		idle = false;
 
-	spin_unlock_irqrestore(&dev_priv->uncore.lock, flags);
 	intel_runtime_pm_put(dev_priv, wakeref);
 
 	return idle;
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2019-02-28  9:17 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-27 20:46 [PATCH 1/2] Revert "drm/i915: Avoid waking the engines just to check if they are idle" Chris Wilson
2019-02-27 20:46 ` [PATCH 2/2] drm/i915: Report engines are idle if already parked Chris Wilson
2019-02-27 21:41   ` [PATCH] " Chris Wilson
2019-02-28  9:08     ` Mika Kuoppala
2019-02-28  9:17       ` Chris Wilson
2019-02-27 21:21 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] Revert "drm/i915: Avoid waking the engines just to check if they are idle" Patchwork
2019-02-27 21:49 ` ✓ Fi.CI.BAT: success " Patchwork
2019-02-27 21:52 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] Revert "drm/i915: Avoid waking the engines just to check if they are idle" (rev2) Patchwork
2019-02-27 22:21 ` ✓ Fi.CI.BAT: success " Patchwork
2019-02-27 23:38 ` ✓ Fi.CI.IGT: " Patchwork
2019-02-28  9:01 ` [PATCH 1/2] Revert "drm/i915: Avoid waking the engines just to check if they are idle" Mika Kuoppala

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.