From 0b7af262aba912f52bc6ef76f1bc0960b01b8502 Mon Sep 17 00:00:00 2001
From: Pierre Willenbrock <pierre@pirsoft.de>
Date: Fri, 19 Jun 2009 18:31:47 +0200
Subject: [PATCH] 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>
---
drivers/char/agp/intel-agp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 35977bfb6999b..8c9d50db5c3a7 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)
static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,
struct page *page, int type)
{
- unsigned long addr = phys_to_gart(page_to_phys(page));
+ dma_addr_t addr = phys_to_gart(page_to_phys(page));
/* Shift high bits down */
addr |= (addr >> 28) & 0xf0;
--
GitLab