summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2011-01-13 12:52:14 +0100
committerThomas Hellstrom <thellstrom@vmware.com>2011-01-13 13:19:32 +0100
commit5b30df47117bc65fd5f14667671041428e1d00b5 (patch)
treee4f8beddbbdb0a0a32a38b500a10e58412559b56 /src
parent8f8f71f0075d9d5cbbfca93425462ba03c5b8046 (diff)
vmwlegacy: Remove Write-Combining setups
The virtual CPUs doesn't support it anyway. Once suggested by Michel Daenzer. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'src')
-rw-r--r--src/vmware.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vmware.c b/src/vmware.c
index 73e86fe..3177138 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -1007,8 +1007,7 @@ VMWAREMapMem(ScrnInfoPtr pScrn)
err = pci_device_map_range(device,
pVMWARE->memPhysBase,
pVMWARE->videoRam,
- PCI_DEV_MAP_FLAG_WRITABLE |
- PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ PCI_DEV_MAP_FLAG_WRITABLE,
(void **) &pVMWARE->FbBase);
if (err) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1018,7 +1017,7 @@ VMWAREMapMem(ScrnInfoPtr pScrn)
}
#else
- pVMWARE->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+ pVMWARE->FbBase = xf86MapPciMem(pScrn->scrnIndex, 0,
pVMWARE->PciTag,
pVMWARE->memPhysBase,
pVMWARE->videoRam);