From patchwork Thu Feb 25 19:09:49 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Eric Anholt <eric@anholt.net>
X-Patchwork-Id: 82106
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 o1PJAp0X032615
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 25 Feb 2010 19:11:31 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 7D473A01F7;
	Thu, 25 Feb 2010 11:10:16 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from annarchy.freedesktop.org (annarchy.freedesktop.org
	[131.252.210.176])
	by gabe.freedesktop.org (Postfix) with ESMTP id 759F69EB3B;
	Thu, 25 Feb 2010 11:10:07 -0800 (PST)
Received: from pollan.anholt.net (annarchy.freedesktop.org [127.0.0.1])
	by annarchy.freedesktop.org (Postfix) with ESMTP id 276F113012D;
	Thu, 25 Feb 2010 11:10:07 -0800 (PST)
Received: by pollan.anholt.net (Postfix, from userid 1000)
	id ECC3664042; Thu, 25 Feb 2010 11:10:02 -0800 (PST)
From: Eric Anholt <eric@anholt.net>
To: intel-gfx@lists.freedesktop.org
Date: Thu, 25 Feb 2010 11:09:49 -0800
Message-Id: <1267124996-17821-7-git-send-email-eric@anholt.net>
X-Mailer: git-send-email 1.7.0
In-Reply-To: <1267124996-17821-1-git-send-email-eric@anholt.net>
References: <1267124996-17821-1-git-send-email-eric@anholt.net>
Subject: [Intel-gfx] [PATCH 06/13] drm/i915: Disable the surface tile
	swizzling on Sandybridge.
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/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>
MIME-Version: 1.0
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, 25 Feb 2010 19:11:31 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8540cd2..f9bfe81 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3419,7 +3419,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 
 	intel_wait_for_vblank(dev);
 
-	if (HAS_PCH_SPLIT(dev)) {
+	if (IS_IRONLAKE(dev)) {
 		/* enable address swizzle for tiling buffer */
 		temp = I915_READ(DISP_ARB_CTL);
 		I915_WRITE(DISP_ARB_CTL, temp | DISP_TILE_SURFACE_SWIZZLING);