Module Name: xsrc
Committed By: mrg
Date: Fri Aug 21 23:50:31 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-cirrus/dist/src: lg_driver.c
Log Message:
merge xf86-video-cirrus 1.3.2
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-cirrus/dist/src/lg_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-cirrus/dist/src/lg_driver.c
diff -u xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.3 xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.4
--- xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.3 Thu Jul 9 03:45:19 2009
+++ xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c Fri Aug 21 23:50:31 2009
@@ -39,8 +39,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -573,6 +575,7 @@
pCir->FbMapSize = pScrn->videoRam * 1024;
pCir->IoMapSize = 0x4000; /* 16K for moment, will increase */
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_COLORMAP
#ifndef EXPERIMENTAL
| RAC_VIEWPORT
@@ -586,7 +589,7 @@
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
-
+#endif
if (!xf86LoadSubModule(pScrn, "ddc")) {
LgFreeRec(pScrn);
return FALSE;
