From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: Intel i915 freeze on latest git
Date: Tue, 1 Feb 2011 09:37:46 -0800
Message-ID: <20110201093746.5e70b107@jbarnes-desktop>
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 cpoproxy2-pub.bluehost.com (cpoproxy2-pub.bluehost.com
	[67.222.39.38])
	by gabe.freedesktop.org (Postfix) with SMTP id 7F0739E74F
	for <dri-devel@lists.freedesktop.org>;
	Tue,  1 Feb 2011 09:37:50 -0800 (PST)
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, Francesco Allertsen <fallertsen@gmail.com>
List-Id: dri-devel@lists.freedesktop.org

On Tue, 01 Feb 2011 16:57:37 +0000
Chris Wilson <chris@chris-wilson.co.uk> wrote:

> On Tue, 1 Feb 2011 08:31:12 -0800, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > The bisect is interesting, I'd have expected a failure when we
> > re-enabled rc6 on ILK or when we fixed up the ring buffer init.
> 
> Yes, that was my instinct as well.
> 
> Though that patch does do have one subtlety:
> 
> ironlake_enable_rc6():
> +      I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) & ~RCX_SW_EXIT);
> 
> So it appears the patch may in fact be enabling render standby, when it
> was actually dropped in
> 
> commit 88271da3f3da75d6eaef5e768c82a1627edf7088
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Wed Jan 5 12:01:24 2011 -0800
> 
>     drm/i915: re-enable rc6 support for Ironlake+
> 
> intel_enable_clock_gating():
> -	I915_WRITE(MCHBAR_RENDER_STANDBY,
> -	           I915_READ(MCHBAR_RENDER_STANDBY) & ~RCX_SW_EXIT);
> 
> 
> So, if this is the issue, then simply commenting out the tweaking of
> RSTDBYCTL in ironlake_enable_rc6() should prevent the hang.

IIRC that really was a cleanup, clearing RCX_SW_EXIT on my machine was
unnecessary, since it was already clear.  But it's worth trying
anyway...

-- 
Jesse Barnes, Intel Open Source Technology Center