Module Name: xsrc
Committed By: macallan
Date: Wed Dec 14 23:58:54 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-igs/dist/src: igs.h igs_accel.c
igs_driver.c
Log Message:
add NoAccel option, general cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-igs/dist/src/igs.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_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-igs/dist/src/igs.h
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.5 xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.6
--- xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.5 Mon May 23 19:51:27 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs.h Wed Dec 14 23:58:54 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */
-/* $NetBSD: igs.h,v 1.5 2011/05/23 19:51:27 christos Exp $ */
+/* $NetBSD: igs.h,v 1.6 2011/12/14 23:58:54 macallan Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -64,6 +64,7 @@ typedef struct {
unsigned long fb_paddr;
Bool shadowFB;
Bool HWCursor;
+ Bool no_accel;
CloseScreenProcPtr CloseScreen;
CreateScreenResourcesProcPtr CreateScreenResources;
EntityInfoPtr pEnt;
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.7 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.8
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.7 Sat May 28 13:26:54 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Wed Dec 14 23:58:54 2011
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: igs_accel.c,v 1.7 2011/05/28 13:26:54 christos Exp $ */
+/* $NetBSD: igs_accel.c,v 1.8 2011/12/14 23:58:54 macallan Exp $ */
#include <sys/types.h>
@@ -92,13 +92,6 @@ IgsWaitMarker(ScreenPtr pScreen, int Mar
LEAVE;
}
-static int
-IgsMarkSync(ScreenPtr pScreenInfo)
-{
- ENTER;
- return 0;
-}
-
static void
IgsWaitReady(IgsPtr fPtr)
{
@@ -193,6 +186,7 @@ IgsCopy
IgsWrite2(fPtr, IGS_COP_HEIGHT_REG, h - 1);
IgsWrite2(fPtr, IGS_COP_PIXEL_OP_REG, fPtr->cmd & 0xffff);
IgsWrite2(fPtr, IGS_COP_PIXEL_OP_REG + 2, (fPtr->cmd >> 16) & 0xffff);
+ exaMarkSync(pDstPixmap->drawable.pScreen);
LEAVE;
}
@@ -251,6 +245,7 @@ IgsSolid(
IgsWrite2(fPtr, IGS_COP_HEIGHT_REG, h - 1);
IgsWrite2(fPtr, IGS_COP_PIXEL_OP_REG, fPtr->cmd & 0xffff);
IgsWrite2(fPtr, IGS_COP_PIXEL_OP_REG + 2, (fPtr->cmd >> 16) & 0xffff);
+ exaMarkSync(pPixmap->drawable.pScreen);
}
/*
@@ -357,7 +352,6 @@ IgsInitAccel(ScreenPtr pScreen)
pExa->maxX = 2048;
pExa->maxY = 2048;
- pExa->MarkSync = IgsMarkSync;
pExa->WaitMarker = IgsWaitMarker;
pExa->PrepareSolid = IgsPrepareSolid;
pExa->Solid = IgsSolid;
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.8 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.9
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.8 Mon May 30 15:11:33 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Wed Dec 14 23:58:54 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.8 2011/05/30 15:11:33 christos Exp $ */
+/* $NetBSD: igs_driver.c,v 1.9 2011/12/14 23:58:54 macallan Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -208,7 +208,7 @@ static const char *ramdacSymbols[] = {
#ifdef XFree86LOADER
static XF86ModuleVersionInfo IgsVersRec = {
"igs",
- MODULEVENDORSTRING,
+ "The NetBSD Foundation",
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
@@ -571,6 +571,12 @@ IgsPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
fPtr->HWCursor ? "HW" : "SW");
+ if (xf86GetOptValBool(fPtr->Options, OPTION_NOACCEL, &fPtr->no_accel))
+ from = X_CONFIG;
+
+ xf86DrvMsg(pScrn->scrnIndex, from, "%s acceleration\n",
+ fPtr->no_accel ? "disabling" : "enabling");
+
/* Load bpp-specific modules */
switch(pScrn->bitsPerPixel) {
default:
@@ -668,7 +674,7 @@ IgsScreenInit(int scrnIndex, ScreenPtr p
return FALSE;
}
- /* find our aperturwe */
+ /* find our aperture */
/* assume 2MB for now, until I add actual RAM size probing */
len = 2 * 1024 * 1024;
@@ -760,7 +766,7 @@ IgsScreenInit(int scrnIndex, ScreenPtr p
xf86SetBackingStore(pScreen);
/* setup acceleration */
- if (1) {
+ if (!fPtr->no_accel) {
XF86ModReqInfo req;
int errmaj, errmin;
@@ -773,7 +779,7 @@ IgsScreenInit(int scrnIndex, ScreenPtr p
return FALSE;
}
if (!IgsInitAccel(pScreen))
- return FALSE;
+ fPtr->no_accel = 1;
}
/* software cursor */
