diff options
| author | Pierre Willenbrock | 2009-06-19 18:31:47 +0200 |
|---|---|---|
| committer | Dave Airlie | 2009-06-20 06:16:59 +0200 |
| commit | 0b7af262aba912f52bc6ef76f1bc0960b01b8502 (patch) | |
| tree | 887c22e1b4ba59b13501ad3c76471d5f1b25b46d /drivers/char | |
| parent | agp: add user mapping support to ATI AGP bridge. (diff) | |
| download | kernel-qcow2-linux-0b7af262aba912f52bc6ef76f1bc0960b01b8502.tar.gz kernel-qcow2-linux-0b7af262aba912f52bc6ef76f1bc0960b01b8502.tar.xz kernel-qcow2-linux-0b7af262aba912f52bc6ef76f1bc0960b01b8502.zip | |
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.c | 2 |
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) 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; |