From patchwork Wed Jan 12 19:46:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 474791 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 p0CJlKHo005450 for ; Wed, 12 Jan 2011 19:47:40 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F40DE9EB7C for ; Wed, 12 Jan 2011 11:47:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from oproxy3-pub.bluehost.com (oproxy3-pub.bluehost.com [69.89.21.8]) by gabe.freedesktop.org (Postfix) with SMTP id 4AAAF9EDD7 for ; Wed, 12 Jan 2011 11:46:53 -0800 (PST) Received: (qmail 26503 invoked by uid 0); 12 Jan 2011 19:46:52 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy3.bluehost.com with SMTP; 12 Jan 2011 19:46:52 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=XWdWDXGwx1qAz138F25qcMlXAmvWKbPojVwwUsu3UhNfgaIzsrtY6hClflqVlEw5/4q2AnrOivqAHOdmVrCQIatKrZmcThyH7Eu5jKww4x50lcUh3CcAr5n28nC7ZO79; Received: from c-67-174-193-198.hsd1.ca.comcast.net ([67.174.193.198] helo=jbarnes-desktop) by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1Pd6ei-0000Ax-By; Wed, 12 Jan 2011 12:46:52 -0700 Date: Wed, 12 Jan 2011 11:46:49 -0800 From: Jesse Barnes To: Linus Torvalds Subject: Re: [git pull] drm intel only fixes Message-ID: <20110112114649.5365d518@jbarnes-desktop> In-Reply-To: References: X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.174.193.198 authed with jbarnes@virtuousgeek.org} Cc: linux-kernel@vger.kernel.org, DRI mailing list 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, 12 Jan 2011 19:47:40 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_d index 9ef5578..4e8af4d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3600,6 +3600,8 @@ static void ironlake_update_wm(struct drm_device *dev, if (enabled != 1) return; + return; + clock = planea_clock ? planea_clock : planeb_clock; /* WM1 */