The warning really does belong there even though it is not part of the
workaround. Once we rootcause how our lists and HW get out of sync, this
patch should be sucked back in.
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <b...@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_gem.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d369e48..8aa84a4 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2294,7 +2294,7 @@ i915_gpu_idle(struct drm_device *dev)
if (lists_empty) {
/* If we require idle maps, enforce the ring is idle */
bool ring_idle = (I915_READ(MI_MODE) & MI_RINGS_IDLE) != 0;
- if (!ring_idle && dev_priv->mm.gtt->do_idle_maps)
+ if (WARN_ON(!ring_idle) && dev_priv->mm.gtt->do_idle_maps)
return flush_rings(dev_priv);
else
return 0;
--
1.7.6.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
