diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-01-17 15:49:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-01-17 15:49:41 +1000 |
| commit | 36ed5521afb524f49bde348775be2bdd78fa0383 (patch) | |
| tree | 7137e6b4fb9608cc2afd4e0998e8686c597f910d | |
| parent | 797e6215ad9039ebbab547581c8ab3c143afb14f (diff) | |
fix some thinkos in the pciaccess patch, this now works on real hardwarepciaccess
| -rw-r--r-- | src/sis_driver.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sis_driver.c b/src/sis_driver.c index 0b3225a..6667185 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -7294,7 +7294,7 @@ SISMapMem(ScrnInfoPtr pScrn) pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024)); #else { - void **result = (void **)&pSiSEnt->IOBase; + void **result = (void **)&pSiS->IOBase; int err = pci_device_map_range(pSiS->PciInfo, pSiS->IOAddress, (pSiS->mmioSize * 1024), @@ -7348,7 +7348,7 @@ SISMapMem(ScrnInfoPtr pScrn) pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024)); #else - void **result = (void **)&pSiSEnt->IOBaseDense; + void **result = (void **)&pSiS->IOBaseDense; int err = pci_device_map_range(pSiS->PciInfo, pSiS->IOAddress, (pSiS->mmioSize * 1024), @@ -7400,7 +7400,7 @@ SISMapMem(ScrnInfoPtr pScrn) #endif #ifndef XSERVER_LIBPCIACCESS - pSiSEnt->FbBase = pSiSEnt->RealFbBase = + pSiS->FbBase = pSiS->RealFbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, pSiS->PciTag, (ULong)pSiS->realFbAddress, pSiS->FbMapSize); @@ -7410,14 +7410,14 @@ SISMapMem(ScrnInfoPtr pScrn) pSiS->FbMapSize, PCI_DEV_MAP_FLAG_WRITABLE | PCI_DEV_MAP_FLAG_WRITE_COMBINE, - (void *)&pSiSEnt->FbBase); + (void *)&pSiS->FbBase); if (err) { xf86DrvMsg (pScrn->scrnIndex, X_ERROR, "Unable to map FB aperture. %s (%d)\n", strerror (err), err); return FALSE; } - pSiSEnt->RealFbBase = pSiSEnt->FbBase; + pSiS->RealFbBase = pSiS->FbBase; #endif pSiS->FbBase += pSiS->dhmOffset; |