From f3f806b0bf364bf7b23eeaaf9e0e76b6c693949a Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Mon, 23 Aug 2010 14:37:52 +0800 Subject: [PATCH] --- yaml --- r: 210195 b: refs/heads/master c: 8dfc2b14ebf538f28a05565f34913ecffedf5024 h: refs/heads/master i: 210193: 596282f2bad4473ceac17d0be4c19425d788beb7 210191: 22caefc47f9e95cdbac37475e8723657b1fcfb2e v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-gtt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ecf59e57a4ed..4236df52c0f4 100644 --- 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 index ce536e68b6c6..7f35854d33a3 100644 --- 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;