Module Name: xsrc
Committed By: riz
Date: Thu Dec 13 17:36:42 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-6]: nv_driver.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #739):
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.2
don't map the VGA framebuffer if AVOID_VGAHW is defined
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5.2.1
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5 Mon Aug 9 16:17:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Thu Dec 13 17:36:42 2012
@@ -1219,7 +1219,9 @@ NVCloseScreen(int scrnIndex, ScreenPtr p
}
NVUnmapMem(pScrn);
+#ifndef AVOID_VGAHW
vgaHWUnmapMem(pScrn);
+#endif
if (pNv->AccelInfoRec)
XAADestroyInfoRec(pNv->AccelInfoRec);
if (pNv->CursorInfoRec)
@@ -1259,6 +1261,7 @@ NVFreeScreen(int scrnIndex, int flags)
* This only gets called when a screen is being deleted. It does not
* get called routinely at the end of a server generation.
*/
+
if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
vgaHWFreeHWRec(xf86Screens[scrnIndex]);
NVFreeRec(xf86Screens[scrnIndex]);
@@ -2410,11 +2413,13 @@ NVScreenInit(int scrnIndex, ScreenPtr pS
}
/* Map the VGA memory when the primary video */
+#ifndef AVOID_VGAHW
if (pNv->Primary && !pNv->FBDev) {
hwp->MapSize = 0x10000;
if (!vgaHWMapMem(pScrn))
return FALSE;
}
+#endif
if (pNv->FBDev) {
fbdevHWSave(pScrn);
