Module Name: xsrc
Committed By: jdc
Date: Wed Jul 25 22:08:03 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-suncg6/dist/src [netbsd-6]: cg6_accel.c
Log Message:
Pull up revision 1.3 (requested by macallan in ticket #443).
apply the same GX_FULL -> GX_INPROGRESS fix as cgsix.c
now this works properly on the SPARCstation LX
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.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-suncg6/dist/src/cg6_accel.c
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c:1.2 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c:1.2.2.1
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c:1.2 Tue Jan 20 10:30:27 2009
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_accel.c Wed Jul 25 22:08:03 2012
@@ -146,7 +146,13 @@ Cg6Sync(ScrnInfoPtr pScrn)
#define runDraw(pCg6) { volatile CARD32 rubbish = pCg6->fbc->draw; }
#define runBlit(pCg6) { volatile CARD32 rubbish = pCg6->fbc->blit; }
-#define waitReady(pCg6) while(pCg6->fbc->s & GX_FULL)
+
+/*
+ * XXX
+ * was GX_FULL, which apparently isn't enough on some (slower) CG6 like
+ * the one found on the SPARCstation LX mainboard
+ */
+#define waitReady(pCg6) while(pCg6->fbc->s & GX_INPROGRESS)
/*
* restore clipping values set by the Xserver since we're messing with them in
