From: Kenneth Graunke <kenneth@whitecape.org>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 3/3] drm/i915: Enable GPU reset on Ivybridge.
Date: Tue, 7 Jun 2011 15:54:41 -0700 [thread overview]
Message-ID: <1307487281-3015-3-git-send-email-kenneth@whitecape.org> (raw)
In-Reply-To: <1307487281-3015-1-git-send-email-kenneth@whitecape.org>
According to the hardware documentation, GDRST is exactly the same as on
Sandybridge. So simply enable the existing code.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---
drivers/gpu/drm/i915/i915_drv.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0defd42..b641a64 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -577,6 +577,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
if (get_seconds() - dev_priv->last_gpu_reset < 5) {
DRM_ERROR("GPU hanging too fast, declaring wedged!\n");
} else switch (INTEL_INFO(dev)->gen) {
+ case 7:
case 6:
ret = gen6_do_reset(dev, flags);
break;
--
1.7.4.4
next prev parent reply other threads:[~2011-06-07 22:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-07 22:54 [PATCH 1/3] drm/i915: Fix MI_DISPLAY_FLIP plane select offset on Ivybridge Kenneth Graunke
2011-06-07 22:54 ` [PATCH 2/3] drm/i915: Remove HAS_BLT/HAS_BSD checks from ivybridge_irq_postinstall Kenneth Graunke
2011-06-07 23:16 ` Keith Packard
2011-06-08 9:29 ` Chris Wilson
2011-06-07 22:54 ` Kenneth Graunke [this message]
2011-06-07 23:18 ` [PATCH 3/3] drm/i915: Enable GPU reset on Ivybridge Keith Packard
2011-06-07 23:14 ` [PATCH 1/3] drm/i915: Fix MI_DISPLAY_FLIP plane select offset " Keith Packard
2011-06-08 0:55 ` Kenneth Graunke
2011-06-08 1:09 ` Keith Packard
2011-06-08 9:36 ` Chris Wilson
2011-06-08 9:54 ` Kenneth Graunke
2011-06-08 10:57 ` 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=1307487281-3015-3-git-send-email-kenneth@whitecape.org \
--to=kenneth@whitecape.org \
--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;
as well as URLs for NNTP newsgroup(s).