Commit 8dfc2b14 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Chris Wilson

agp/intel: fix physical address mask bits for sandybridge

It should shift bit 39-32 into pte's bit 11-4.
Reported-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 032d2a0d
...@@ -1333,8 +1333,8 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge, ...@@ -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, static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge,
dma_addr_t addr, int type) dma_addr_t addr, int type)
{ {
/* Shift high bits down */ /* gen6 has bit11-4 for physical addr bit39-32 */
addr |= (addr >> 28) & 0xff; addr |= (addr >> 28) & 0xff0;
/* Type checking must be done elsewhere */ /* Type checking must be done elsewhere */
return addr | bridge->driver->masks[type].mask; return addr | bridge->driver->masks[type].mask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment