Module Name: xsrc Committed By: macallan Date: Thu May 20 19:45:21 UTC 2010
Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs_accel.c Log Message: add a PrepareAccess method to make sure the drawing engine is idle before trying to scribble into video memory This should not be necessary but for some reason we need it here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_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-igs/dist/src/igs_accel.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.3 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.4 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.3 Thu May 20 07:55:20 2010 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Thu May 20 19:45:21 2010 @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $NetBSD: igs_accel.c,v 1.3 2010/05/20 07:55:20 macallan Exp $ */ +/* $NetBSD: igs_accel.c,v 1.4 2010/05/20 19:45:21 macallan Exp $ */ #include <sys/types.h> @@ -308,6 +308,23 @@ return TRUE; } +#ifdef __arm__ +static Bool +IgsPrepareAccess(PixmapPtr pPix, int index) +{ + ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; + IgsPtr fPtr = IGSPTR(pScrn); + + IgsWaitReady(fPtr); + return TRUE; +} + +static void +IgsFinishAccess(PixmapPtr pPix, int index) +{ +} +#endif + Bool IgsInitAccel(ScreenPtr pScreen) { @@ -368,6 +385,9 @@ */ pExa->UploadToScreen = IgsUploadToScreen; pExa->DownloadFromScreen = IgsDownloadFromScreen; - +#ifdef __arm__ + pExa->PrepareAccess = IgsPrepareAccess; + pExa->FinishAccess = IgsFinishAccess; +#endif return exaDriverInit(pScreen, pExa); }