diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-29 05:25:58 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-03 04:05:00 -0400 |
commit | 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 (patch) | |
tree | 416ec7de6c42fa5dd7885b53388a1bbee0b3aeed /drivers/char/agp/hp-agp.c | |
parent | f692775d7e0a22477143cd884e45c955448ac7d2 (diff) |
agp: kill phys_to_gart() and gart_to_phys()
There seems to be no reason for these -- they're a 1:1 mapping on all
platforms.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/char/agp/hp-agp.c')
-rw-r--r-- | drivers/char/agp/hp-agp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 64dbf4b1cf2f..501e293e5ad0 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c | |||
@@ -107,7 +107,7 @@ static int __init hp_zx1_ioc_shared(void) | |||
107 | hp->gart_size = HP_ZX1_GART_SIZE; | 107 | hp->gart_size = HP_ZX1_GART_SIZE; |
108 | hp->gatt_entries = hp->gart_size / hp->io_page_size; | 108 | hp->gatt_entries = hp->gart_size / hp->io_page_size; |
109 | 109 | ||
110 | hp->io_pdir = gart_to_virt(readq(hp->ioc_regs+HP_ZX1_PDIR_BASE)); | 110 | hp->io_pdir = phys_to_virt(readq(hp->ioc_regs+HP_ZX1_PDIR_BASE)); |
111 | hp->gatt = &hp->io_pdir[HP_ZX1_IOVA_TO_PDIR(hp->gart_base)]; | 111 | hp->gatt = &hp->io_pdir[HP_ZX1_IOVA_TO_PDIR(hp->gart_base)]; |
112 | 112 | ||
113 | if (hp->gatt[0] != HP_ZX1_SBA_IOMMU_COOKIE) { | 113 | if (hp->gatt[0] != HP_ZX1_SBA_IOMMU_COOKIE) { |
@@ -246,7 +246,7 @@ hp_zx1_configure (void) | |||
246 | agp_bridge->mode = readl(hp->lba_regs+hp->lba_cap_offset+PCI_AGP_STATUS); | 246 | agp_bridge->mode = readl(hp->lba_regs+hp->lba_cap_offset+PCI_AGP_STATUS); |
247 | 247 | ||
248 | if (hp->io_pdir_owner) { | 248 | if (hp->io_pdir_owner) { |
249 | writel(virt_to_gart(hp->io_pdir), hp->ioc_regs+HP_ZX1_PDIR_BASE); | 249 | writel(virt_to_phys(hp->io_pdir), hp->ioc_regs+HP_ZX1_PDIR_BASE); |
250 | readl(hp->ioc_regs+HP_ZX1_PDIR_BASE); | 250 | readl(hp->ioc_regs+HP_ZX1_PDIR_BASE); |
251 | writel(hp->io_tlb_ps, hp->ioc_regs+HP_ZX1_TCNFG); | 251 | writel(hp->io_tlb_ps, hp->ioc_regs+HP_ZX1_TCNFG); |
252 | readl(hp->ioc_regs+HP_ZX1_TCNFG); | 252 | readl(hp->ioc_regs+HP_ZX1_TCNFG); |