aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorPierre Willenbrock <pierre@pirsoft.de>2009-06-19 12:31:47 -0400
committerDave Airlie <airlied@redhat.com>2009-06-20 00:16:59 -0400
commit0b7af262aba912f52bc6ef76f1bc0960b01b8502 (patch)
tree887c22e1b4ba59b13501ad3c76471d5f1b25b46d /drivers/char
parenta95fe463e73b8c7b2d97606ac86ce261f1270726 (diff)
agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses
Otherwise, the high bits to be stuffed in the unused lower bits of the page address are lost. Signed-off-by: Pierre Willenbrock <pierre@pirsoft.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-agp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 35977bfb6999..8c9d50db5c3a 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1198,7 +1198,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
1198static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge, 1198static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,
1199 struct page *page, int type) 1199 struct page *page, int type)
1200{ 1200{
1201 unsigned long addr = phys_to_gart(page_to_phys(page)); 1201 dma_addr_t addr = phys_to_gart(page_to_phys(page));
1202 /* Shift high bits down */ 1202 /* Shift high bits down */
1203 addr |= (addr >> 28) & 0xf0; 1203 addr |= (addr >> 28) & 0xf0;
1204 1204