From patchwork Wed Feb 2 09:56:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francesco Allertsen X-Patchwork-Id: 526291 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 p129ttQ9002599 for ; Wed, 2 Feb 2011 09:56:21 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ECA009E968 for ; Wed, 2 Feb 2011 01:55:54 -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 182F39E794 for ; Wed, 2 Feb 2011 01:55:47 -0800 (PST) Received: from localhost (host233-41-dynamic.10-87-r.retail.telecomitalia.it [87.10.41.233]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.emaiti.net (Postfix) with ESMTP id 18544AF707; Wed, 2 Feb 2011 10:56:13 +0100 (CET) Date: Wed, 2 Feb 2011 10:56:57 +0100 From: Francesco Allertsen To: Chris Wilson Subject: Re: Intel i915 freeze on latest git Message-ID: <20110202095656.GA2202@fujiko> References: <20110201112200.GA2349@fujiko> <1bdc18$jeuv05@fmsmga002.fm.intel.com> <20110201122943.GA2011@fujiko> <20110201140754.GA2229@fujiko> <20110201083112.3cfefc3a@jbarnes-desktop> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 09:56:41 +0000 (UTC) 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 */