From mboxrd@z Thu Jan  1 00:00:00 1970
From: Francesco Allertsen <fallertsen@gmail.com>
Subject: Re: Intel i915 freeze on latest git
Date: Wed, 2 Feb 2011 10:56:57 +0100
Message-ID: <20110202095656.GA2202@fujiko>
References: <20110201112200.GA2349@fujiko>
	<1bdc18$jeuv05@fmsmga002.fm.intel.com>
	<20110201122943.GA2011@fujiko>
	<b9dded$hqm5n7@orsmga002.jf.intel.com>
	<20110201140754.GA2229@fujiko>
	<20110201083112.3cfefc3a@jbarnes-desktop>
	<b7da2f$qaam25@fmsmga001.fm.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from mail.emaiti.net (emaiti.net [46.4.199.113])
	by gabe.freedesktop.org (Postfix) with ESMTP id 182F39E794
	for <dri-devel@lists.freedesktop.org>;
	Wed,  2 Feb 2011 01:55:47 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <b7da2f$qaam25@fmsmga001.fm.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

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.

Bye
Francesco