From patchwork Wed Feb  2 11:46:54 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Francesco Allertsen <fallertsen@gmail.com>
X-Patchwork-Id: 526471
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p12Bjprv002096
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Wed, 2 Feb 2011 11:46:12 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id EA9749E73F
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Wed,  2 Feb 2011 03:45:51 -0800 (PST)
X-Original-To: dri-devel@lists.freedesktop.org
Delivered-To: dri-devel@lists.freedesktop.org
Received: from mail.emaiti.net (emaiti.net [46.4.199.113])
	by gabe.freedesktop.org (Postfix) with ESMTP id 684F39E73F
	for <dri-devel@lists.freedesktop.org>;
	Wed,  2 Feb 2011 03:45:43 -0800 (PST)
Received: from localhost (host119-19-dynamic.1-87-r.retail.telecomitalia.it
	[87.1.19.119])
	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(No client certificate requested)
	by mail.emaiti.net (Postfix) with ESMTP id 4E84AAF7AB;
	Wed,  2 Feb 2011 12:46:09 +0100 (CET)
Date: Wed, 2 Feb 2011 12:46:54 +0100
From: Francesco Allertsen <fallertsen@gmail.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: Intel i915 freeze on latest git
Message-ID: <20110202114653.GA2243@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>
	<20110202095656.GA2202@fujiko>
	<1bdc18$jfb1or@fmsmga002.fm.intel.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1bdc18$jfb1or@fmsmga002.fm.intel.com>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: dri-devel@lists.freedesktop.org
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
	<dri-devel.lists.freedesktop.org>
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+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 02 Feb 2011 11:46:12 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7769768..2ef0333 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6505,6 +6505,8 @@ void ironlake_enable_rc6(struct drm_device *dev)
        struct drm_i915_private *dev_priv = dev->dev_private;
        int ret;
 
+       return;
+
        /*
         * GPU can automatically power down the render unit if given a page
         * to save state.