diff mbox

drm/i915: Enable GPU reset on Ivybridge.

Message ID 1305199513-4402-1-git-send-email-kenneth@whitecape.org
State New, archived
Headers show

Commit Message

Kenneth Graunke May 12, 2011, 11:25 a.m. UTC
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(-)

GPU reset does not seem terribly reliable, but did work at least once:

My GPU hung halfway through an OpenArena run, successfully reset (the screen
went blank for a moment), and continued rendering, finishing the time demo.

I was also able to run glxgears after the reset.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f72f9ff..71a06d0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -547,6 +547,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;