summaryrefslogtreecommitdiff
path: root/src/nv_setup.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2009-07-06 20:16:02 +1000
committerBen Skeggs <bskeggs@redhat.com>2009-07-06 20:17:44 +1000
commit1e22673f43acd0f02ba36e189b39e28b635cd50c (patch)
tree47c17a47d79c406e97ec7ad2ae3050222849a3e6 /src/nv_setup.c
parentaafb62f86adebb3418876649e8bd189c1523e961 (diff)
Remove non-XSERVER_LIBPCIACCESS paths, we depend on a new xserver anyway
Diffstat (limited to 'src/nv_setup.c')
-rw-r--r--src/nv_setup.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c
index dd96990..7e31c2c 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -74,18 +74,9 @@ NVCommonSetup(ScrnInfoPtr pScrn)
NVPtr pNv = NVPTR(pScrn);
uint16_t implementation = pNv->Chipset & 0x0ff0;
-#ifndef XSERVER_LIBPCIACCESS
- pNv->REGS = xf86MapPciMem(pScrn->scrnIndex,
- VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
- pNv->PciTag, pNv->IOAddress, 0x01000000);
- pNv->FB_BAR = xf86MapPciMem(pScrn->scrnIndex,
- VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
- pNv->PciTag, pNv->VRAMPhysical, 0x10000);
-#else
/* 0x01000000 is the size */
pci_device_map_range(pNv->PciInfo, pNv->IOAddress, 0x01000000, PCI_DEV_MAP_FLAG_WRITABLE, (void *)&pNv->REGS);
pci_device_map_range(pNv->PciInfo, pNv->VRAMPhysical, 0x10000, PCI_DEV_MAP_FLAG_WRITABLE, (void *)&pNv->FB_BAR);
-#endif /* XSERVER_LIBPCIACCESS */
pNv->alphaCursor = (pNv->NVArch >= 0x11);