Module Name: xsrc
Committed By: mrg
Date: Fri Aug 21 23:55:58 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: glint_driver.c
Log Message:
merge xf86-video-glint 1.2.4
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-glint/dist/src/glint_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-glint/dist/src/glint_driver.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.4 xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.4 Thu Jul 9 03:46:21 2009
+++ xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c Fri Aug 21 23:55:58 2009
@@ -42,8 +42,10 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "fbdevhw.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "xf86int10.h"
#include "dixstruct.h"
#include "vbe.h"
@@ -65,8 +67,13 @@
#endif
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#define DEBUG 0
@@ -929,12 +936,13 @@
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
xf86SetOperatingState(resVga, pGlint->pEnt->index, ResDisableOpr);
/* Operations for which memory access is required. */
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
/*
@@ -1261,6 +1269,7 @@
pGlint->irq = pGlint->pEnt->device->irq;
+#ifndef XSERVER_LIBPCIACCESS
/* Register all entities */
for (i = 0; i < pScrn->numEntities; i++) {
EntityInfoPtr pEnt;
@@ -1271,8 +1280,10 @@
return FALSE;
}
}
+#endif
}
+
#if !defined(__sparc__)
/* Initialize the card through int10 interface if needed */
if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA &&
