diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-09-19 10:28:53 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-26 17:18:21 -0700 |
| commit | 1252894fa9ea0a4e73cb68f49f5913dda9834d6c (patch) | |
| tree | ad43cb43374274319463f2651b55ab76d7d9bfbc | |
| parent | 6d51cdffcae15394f615489d57d8ca0e9a91e494 (diff) | |
agp/intel: fix physical address mask bits for sandybridge
[This is backport patch from upstream 8dfc2b14.]
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index c1119ee08ad..ed11c770c9a 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -1317,6 +1317,16 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge, return addr | bridge->driver->masks[type].mask; } +static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge, + dma_addr_t addr, int type) +{ + /* 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; +} + static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) { u16 snb_gmch_ctl; @@ -1535,7 +1545,7 @@ static const struct agp_bridge_driver intel_gen6_driver = { .configure = intel_i9xx_configure, .fetch_size = intel_i9xx_fetch_size, .cleanup = intel_i915_cleanup, - .mask_memory = intel_i965_mask_memory, + .mask_memory = intel_gen6_mask_memory, .masks = intel_i810_masks, .agp_enable = intel_i810_agp_enable, .cache_flush = global_cache_flush, |