From patchwork Thu Feb 18 23:19:05 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alexander Lam <lambchop468@gmail.com>
X-Patchwork-Id: 80476
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1INJTv4009972
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 18 Feb 2010 23:20:05 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 7F8B3A088F;
	Thu, 18 Feb 2010 15:19:29 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from ey-out-1920.google.com (ey-out-1920.google.com
	[74.125.78.144])
	by gabe.freedesktop.org (Postfix) with ESMTP id 4F4AAA0875;
	Thu, 18 Feb 2010 15:19:25 -0800 (PST)
Received: by ey-out-1920.google.com with SMTP id 3so294708eyh.38
	for <multiple recipients>; Thu, 18 Feb 2010 15:19:25 -0800 (PST)
MIME-Version: 1.0
Received: by 10.213.109.74 with SMTP id i10mr190306ebp.61.1266535165115;
	Thu, 18 Feb 2010 15:19:25 -0800 (PST)
In-Reply-To: <f3f71ab91002181436h4efe8afi4b647ab58dcdd858@mail.gmail.com>
References: <f3f71ab91002181436h4efe8afi4b647ab58dcdd858@mail.gmail.com>
From: Alexander Lam <lambchop468@gmail.com>
Date: Thu, 18 Feb 2010 18:19:05 -0500
Message-ID: <dfb03c971002181519n374661bewf04391025b80fab9@mail.gmail.com>
To: Mike Lothian <mike@fireburn.co.uk>
Cc: intel-gfx@lists.freedesktop.org,
	"mesa3d-dev@lists.sourceforge.net" <Mesa3d-dev@lists.sourceforge.net>,
	Xorg <xorg@lists.freedesktop.org>
Subject: Re: [Intel-gfx] Problems Compiling from Git
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 18 Feb 2010 23:20:05 +0000 (UTC)


diff -puNr a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c	2010-02-18 18:14:11.287962137 -0500
+++ b/drivers/gpu/drm/i915/intel_display.c	2010-02-18 18:13:51.336212730 -0500
@@ -2775,7 +2775,7 @@ static void i9xx_update_wm(struct drm_de
 		if (IS_I945G(dev) || IS_I945GM(dev)) {
 			I915_WRITE(FW_BLC_SELF, I915_READ(FW_BLC_SELF)
 				   & ~FW_BLC_SELF_EN);
-		} else if (IS_I915GM) {
+		} else if (IS_I915GM(dev)) {
 			I915_WRITE(INSTPM, I915_READ(INSTPM) & ~INSTPM_SELF_EN);
 		}
 	}