[PATCH] drm/i915: add 'reset' parameter

[PATCH] drm/i915: add 'reset' parameter

[Zhenyu Wang]

Useful for debugging hang bug that not require GPU auto reset,
to grab INSTDONE bits and make aub dump life easy.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c |    3 +++
 drivers/gpu/drm/i915/i915_drv.h |    1 +
 drivers/gpu/drm/i915/i915_irq.c |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5f20cd9..d052807 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -49,6 +49,9 @@ module_param_named(powersave, i915_powersave, int, 0600);
 unsigned int i915_lvds_downclock = 0;
 module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);
 
+unsigned int i915_do_reset = 1;
+module_param_named(reset, i915_do_reset, int, 0600);
+
 static struct drm_driver driver;
 extern int intel_agp_enabled;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 30780f2..9126282 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -950,6 +950,7 @@ extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc;
 extern unsigned int i915_powersave;
 extern unsigned int i915_lvds_downclock;
+extern unsigned int i915_do_reset;
 
 extern int i915_suspend(struct drm_device *dev, pm_message_t state);
 extern int i915_resume(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 02e4dd8..6058b46 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -414,7 +414,7 @@ static void i915_error_work_func(struct work_struct *work)
 
 	kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event);
 
-	if (atomic_read(&dev_priv->mm.wedged)) {
+	if (atomic_read(&dev_priv->mm.wedged) && i915_do_reset) {
 		DRM_DEBUG_DRIVER("resetting chip\n");
 		kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event);
 		if (!i915_reset(dev, GRDOM_RENDER)) {
-- 
1.7.1

Re: [PATCH] drm/i915: add reset parameter

[Chris Wilson]

On Thu, 16 Dec 2010 13:29:09 +0800, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> Useful for debugging hang bug that not require GPU auto reset,
> to grab INSTDONE bits and make aub dump life easy.

That has the minor side-effect of causing the driver to hang.

What aub dump? We need to improve the error state capture anyway, so let's
address that.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] drm/i915: add reset parameter

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 661 bytes --]

On Thu, 16 Dec 2010 09:51:51 +0000, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Thu, 16 Dec 2010 13:29:09 +0800, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > Useful for debugging hang bug that not require GPU auto reset,
> > to grab INSTDONE bits and make aub dump life easy.
> 
> That has the minor side-effect of causing the driver to hang.
> 
> What aub dump? We need to improve the error state capture anyway, so let's
> address that.
> -Chris

My hacked version of this has been very useful in early hardware bringup
where I want to spend a while looking at the bits over and over and
don't want just a sample of the stuck state.

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: add "reset" parameter

[Chris Wilson]

On Thu, 16 Dec 2010 13:29:09 +0800, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> Useful for debugging hang bug that not require GPU auto reset,
> to grab INSTDONE bits and make aub dump life easy.

I pushed an alternate version of this patch to -next.
Thanks,
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre