From: Ben Widawsky <ben@bwidawsk.net>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
Subject: [PATCH v2 4/4] drm/i915: add unidle warning back
Date: Sat, 24 Sep 2011 15:23:07 -0700 [thread overview]
Message-ID: <1316902987-24774-5-git-send-email-ben@bwidawsk.net> (raw)
In-Reply-To: <1316902987-24774-1-git-send-email-ben@bwidawsk.net>
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 <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@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
prev parent reply other threads:[~2011-09-24 22:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-24 22:23 [PATCH v2 0/4] Ironlake mobile GPU with VT-d, fix Ben Widawsky
2011-09-24 22:23 ` [PATCH v2 1/4] drm/i915: add warning for unidle GPU Ben Widawsky
2011-09-25 10:16 ` Daniel Vetter
2011-09-25 11:15 ` Chris Wilson
2011-09-24 22:23 ` [PATCH v2 2/4] drm/i915: Ironlake mobile GPU with VT-d fix Ben Widawsky
2011-09-24 22:41 ` Ben Widawsky
2011-09-25 9:40 ` Daniel Vetter
2011-09-25 23:42 ` Ben Widawsky
2011-09-26 7:23 ` Daniel Vetter
2011-10-15 2:08 ` Ben Widawsky
2011-09-24 22:23 ` [PATCH v2 3/4] intel-iommu: IOTLB hang workaround Ben Widawsky
2011-09-24 22:23 ` Ben Widawsky [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316902987-24774-5-git-send-email-ben@bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.