---

yaml --- r: 210195 b: refs/heads/master c: 8dfc2b1 h: refs/heads/master i: 210193: 596282f 210191: 22caefc v: v3
git-mirror · Sep 7, 2010 · f3f806b · f3f806b
1 parent d1b5253
commit f3f806b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 032d2a0d068b0368296a56469761394ef03207c3
+refs/heads/master: 8dfc2b14ebf538f28a05565f34913ecffedf5024
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
@@ -1333,8 +1333,8 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,
 static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge,
 					    dma_addr_t addr, int type)
 {
-	/* Shift high bits down */
-	addr |= (addr >> 28) & 0xff;
+	/* gen6 has bit11-4 for physical addr bit39-32 */
+	addr |= (addr >> 28) & 0xff0;
 
 	/* Type checking must be done elsewhere */
 	return addr | bridge->driver->masks[type].mask;