From patchwork Thu Feb 25 19:09:48 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: 82096
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 o1PJACS8032357
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 25 Feb 2010 19:10:51 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id E2BD39EB5B;
	Thu, 25 Feb 2010 11:10:11 -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 288459EB93;
	Thu, 25 Feb 2010 11:10:06 -0800 (PST)
Received: from pollan.anholt.net (annarchy.freedesktop.org [127.0.0.1])
	by annarchy.freedesktop.org (Postfix) with ESMTP id C194313012F;
	Thu, 25 Feb 2010 11:10:05 -0800 (PST)
Received: by pollan.anholt.net (Postfix, from userid 1000)
	id E87DB64041; 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:48 -0800
Message-Id: <1267124996-17821-6-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 05/13] agp/intel: Use a non-reserved value for
	the cache field of the PTEs.
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:10:51 +0000 (UTC)


diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index df85ed9..c3c870b 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -296,6 +296,11 @@ static void intel_agp_insert_sg_entries(struct agp_memory *mem,
 					off_t pg_start, int mask_type)
 {
 	int i, j;
+	u32 cache_bits = 0;
+
+	if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB) {
+		cache_bits = I830_PTE_SYSTEM_CACHED;
+	}
 
 	for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
 		writel(agp_bridge->driver->mask_memory(agp_bridge,