diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-27 10:27:29 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-03 09:04:44 +0100 |
| commit | 2a4ceb6d3e6a566cb4a9dc8f974177f031d27cd7 (patch) | |
| tree | a21d2c5ad10522d9a1469e7cd985d5f1d8f5d17f /drivers/char/agp/backend.c | |
| parent | ed680c4ad478d0fee9740f7d029087f181346564 (diff) | |
| download | kernel_samsung_espresso10-2a4ceb6d3e6a566cb4a9dc8f974177f031d27cd7.zip kernel_samsung_espresso10-2a4ceb6d3e6a566cb4a9dc8f974177f031d27cd7.tar.gz kernel_samsung_espresso10-2a4ceb6d3e6a566cb4a9dc8f974177f031d27cd7.tar.bz2 | |
agp: Switch mask_memory() method to take address argument again, not page
In commit 07613ba2 ("agp: switch AGP to use page array instead of
unsigned long array") we switched the mask_memory() method to take a
'struct page *' instead of an address. This is painful, because in some
cases it has to be an IOMMU-mapped virtual bus address (in fact,
shouldn't it _always_ be a dma_addr_t returned from pci_map_xxx(), and
we just happen to get lucky most of the time?)
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/char/agp/backend.c')
| -rw-r--r-- | drivers/char/agp/backend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index cfa5a64..3bd7e50 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c @@ -150,8 +150,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) } bridge->scratch_page_real = phys_to_gart(page_to_phys(page)); - bridge->scratch_page = - bridge->driver->mask_memory(bridge, page, 0); + bridge->scratch_page = bridge->driver->mask_memory(bridge, + phys_to_gart(page_to_phys(page)), 0); } size_value = bridge->driver->fetch_size(); |