diff options
| author | Guillem Jover <guillem@hadrons.org> | 2013-09-27 19:20:11 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2013-10-22 03:59:39 +0200 |
| commit | 774461a4ac92c39c3b3ec975a887540dfa791eae (patch) | |
| tree | e3f4325d14d9496f16b3fc459a8ce49fcce45960 | |
| parent | 646137de571a9df950d3a3edb454803268fd5f98 (diff) | |
Use new pci_device_(un)map_range functions instead of deprecated ones
Signed-off-by: Guillem Jover <guillem@hadrons.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/tdfx_driver.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c index 412da07..6bc123b 100644 --- a/src/tdfx_driver.c +++ b/src/tdfx_driver.c @@ -1253,11 +1253,11 @@ TDFXMapMem(ScrnInfoPtr pScrn) * FIXME: don't have any such hardware to test. */ for (i = 0; i < pTDFX->numChips; i++) { - err = pci_device_map_memory_range(pTDFX->PciInfo[i], - pTDFX->MMIOAddr[i], - TDFXIOMAPSIZE, - TRUE, - & pTDFX->MMIOBase[i]); + err = pci_device_map_range(pTDFX->PciInfo[i], + pTDFX->MMIOAddr[i], + TDFXIOMAPSIZE, + PCI_DEV_MAP_FLAG_WRITABLE, + & pTDFX->MMIOBase[i]); if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to map MMIO region for card %u (%d).\n", @@ -1267,11 +1267,11 @@ TDFXMapMem(ScrnInfoPtr pScrn) } - err = pci_device_map_memory_range(pTDFX->PciInfo[0], - pTDFX->LinearAddr[0], - pTDFX->FbMapSize, - TRUE, - & pTDFX->FbBase); + err = pci_device_map_range(pTDFX->PciInfo[0], + pTDFX->LinearAddr[0], + pTDFX->FbMapSize, + PCI_DEV_MAP_FLAG_WRITABLE, + & pTDFX->FbBase); if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to map framebuffer (%d).\n", err); @@ -1307,8 +1307,12 @@ TDFXUnmapMem(ScrnInfoPtr pScrn) pTDFX = TDFXPTR(pScrn); #ifdef XSERVER_LIBPCIACCESS - pci_device_unmap_region(pTDFX->PciInfo[0], 0); - pci_device_unmap_region(pTDFX->PciInfo[0], 1); + pci_device_unmap_range(pTDFX->PciInfo[0], + pTDFX->FbBase, + pTDFX->FbMapSize); + pci_device_unmap_range(pTDFX->PciInfo[0], + pTDFX->MMIOBase[0], + TDFXIOMAPSIZE); (void) memset(pTDFX->MMIOBase, 0, sizeof(pTDFX->MMIOBase)); pTDFX->FbBase = NULL; |