From: Ben Widawsky <ben@bwidawsk.net>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
Subject: [PATCH 4/4] drm/i915: Cleanup instdone state when idle
Date: Mon, 13 Aug 2012 22:41:11 -0700 [thread overview]
Message-ID: <1344922871-2248-4-git-send-email-ben@bwidawsk.net> (raw)
In-Reply-To: <1344922871-2248-1-git-send-email-ben@bwidawsk.net>
The previous state is bogus when we've gone into idle. Actually there
would be a known state of idle (ie. all units are done), but since it
differs for every platform, we can just set 0, and let the hangcheck
progress as normal.
References: https://bugs.freedesktop.org/show_bug.cgi?id=52429
Tested-by: Guang A Yang <guang.a.yang@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_gem.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 31054fa..5f116a1 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3624,6 +3624,9 @@ i915_gem_idle(struct drm_device *dev)
/* Cancel the retire work handler, which should be idle now. */
cancel_delayed_work_sync(&dev_priv->mm.retire_work);
+ dev_priv->last_instdone = 0;
+ dev_priv->last_instdone1 = 0;
+
return 0;
}
--
1.7.11.4
next prev parent reply other threads:[~2012-08-14 5:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-14 5:41 [PATCH 1/4] drm/i915/contexts: fix list corruption Ben Widawsky
2012-08-14 5:41 ` [PATCH 2/4] drm/i915/contexts: Add forced switches Ben Widawsky
2012-08-14 5:41 ` [PATCH 3/4] drm/i915/contexts: Serialize default context init Ben Widawsky
2012-08-14 7:41 ` Chris Wilson
2012-08-14 16:41 ` Ben Widawsky
2012-08-14 5:41 ` Ben Widawsky [this message]
2012-08-14 7:39 ` [PATCH 4/4] drm/i915: Cleanup instdone state when idle Chris Wilson
2012-08-14 16:42 ` Ben Widawsky
2012-08-14 16:48 ` Chris Wilson
2012-08-14 7:36 ` [PATCH 1/4] drm/i915/contexts: fix list corruption Chris Wilson
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=1344922871-2248-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox