reverted r19986. uncached mapping didn't work, instead it was falling back to vesa mode.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19987 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -92,7 +92,6 @@ MapDevice()
|
|||||||
SharedInfo *si = gPd->si;
|
SharedInfo *si = gPd->si;
|
||||||
int writeCombined = 1;
|
int writeCombined = 1;
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* Map the frame buffer */
|
/* Map the frame buffer */
|
||||||
si->fbArea = map_physical_memory("VMware frame buffer",
|
si->fbArea = map_physical_memory("VMware frame buffer",
|
||||||
si->fbDma, si->fbSize, B_ANY_KERNEL_BLOCK_ADDRESS|B_MTR_WC,
|
si->fbDma, si->fbSize, B_ANY_KERNEL_BLOCK_ADDRESS|B_MTR_WC,
|
||||||
@@ -104,14 +103,6 @@ MapDevice()
|
|||||||
si->fbDma, si->fbSize, B_ANY_KERNEL_BLOCK_ADDRESS,
|
si->fbDma, si->fbSize, B_ANY_KERNEL_BLOCK_ADDRESS,
|
||||||
B_READ_AREA|B_WRITE_AREA, (void **)&si->fb);
|
B_READ_AREA|B_WRITE_AREA, (void **)&si->fb);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
/* Workaround for KDL problem. Map the frame buffer in
|
|
||||||
uncached mode, see bug report #994 */
|
|
||||||
writeCombined = 0;
|
|
||||||
si->fbArea = map_physical_memory("VMware frame buffer",
|
|
||||||
si->fbDma, si->fbSize, B_ANY_KERNEL_BLOCK_ADDRESS|B_MTR_UC,
|
|
||||||
B_READ_AREA|B_WRITE_AREA, (void **)&si->fb);
|
|
||||||
#endif
|
|
||||||
if (si->fbArea < 0) {
|
if (si->fbArea < 0) {
|
||||||
TRACE("failed to map frame buffer\n");
|
TRACE("failed to map frame buffer\n");
|
||||||
return si->fbArea;
|
return si->fbArea;
|
||||||
|
|||||||
Reference in New Issue
Block a user