On Wed, 2 Feb 2011 10:56:57 +0100, Francesco Allertsen fallertsen@gmail.com wrote:
On Tue, Feb 01, 2011 at 04:57:37PM +0000, Chris Wilson wrote:
So, if this is the issue, then simply commenting out the tweaking of RSTDBYCTL in ironlake_enable_rc6() should prevent the hang.
I've tried the following patch
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d7f237d..7769768 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6527,7 +6527,6 @@ void ironlake_enable_rc6(struct drm_device *dev) ADVANCE_LP_RING();
I915_WRITE(PWRCTXA, dev_priv->pwrctx->gtt_offset | PWRCTX_EN);
- I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) & ~RCX_SW_EXIT);
}
/* Set up chip specific display functions */
And it still hangs.
Hmm, that was the only change I could spot between the two patches. Care to disable that function and see what happens? [i.e. put a return before we write anything to the ring] -Chris