 @@ -1,15 +1,15 @@
 /* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */
-/* $NetBSD: igs.h,v 1.1 2009/11/10 21:39:45 macallan Exp $ */
+/* $NetBSD: igs.h,v 1.2 2010/05/20 07:55:19 macallan Exp $ */
 /*
  * Copyright (c) 2001 Matthieu Herrb
  *		 2009 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  *    - Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *    - Redistributions in binary form must reproduce the above
  *      copyright notice, this list of conditions and the following
 @@ -47,50 +47,51 @@
 #include "xf86_OSproc.h"
 #include "xf86RamDac.h"
 #include "exa.h"
 #ifndef IGS_H
 #define IGS_H
 /* private data */
 typedef struct {
 	int			fd; /* file descriptor of open device */
 	struct wsdisplay_fbinfo info; /* frame buffer characteristics */
 	int			linebytes; /* number of bytes per row */
-	uint8_t			*reg;
+	volatile uint8_t	*reg;
 	unsigned char*		fbstart;
 	unsigned char*		fbmem;
 	size_t			fbmem_len;
 	unsigned long		fb_paddr;
 	Bool			shadowFB;
 	Bool			HWCursor;
 	CloseScreenProcPtr	CloseScreen;
 	CreateScreenResourcesProcPtr CreateScreenResources;
 	EntityInfoPtr		pEnt;
 	struct wsdisplay_cursor cursor;
 	int			maskoffset;
 	int			Chipset;
 	xf86CursorInfoPtr	CursorInfoRec;
 	ExaDriverPtr 		pExa;
 	int			shift, srcoff, srcpitch;
 	uint32_t		cmd;
 #ifdef XFreeXDGA
 	/* DGA info */
 	DGAModePtr		pDGAMode;
 	int			nDGAMode;
 #endif
 	OptionInfoPtr		Options;
 	uint8_t			mapfmt;
 } IgsRec, *IgsPtr;
 #define IGSPTR(p) ((IgsPtr)((p)->driverPrivate))
 Bool IgsSetupCursor(ScreenPtr);
 /* register definitions, from NetBSD's igsfbreg.h */
 /* right now we only care about the extended VGA registers */
 #define IGS_EXT_IDX		0x3ce
 #define IGS_EXT_PORT		0x3cf
 /* [3..0] -> [19..16] of start addr if IGS_EXT_START_ADDR_ON is set */

 @@ -1,15 +1,15 @@
 /* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.1 2009/11/10 21:39:45 macallan Exp $ */
+/* $NetBSD: igs_driver.c,v 1.2 2010/05/20 07:55:20 macallan Exp $ */
 /*
  * Copyright (c) 2001 Matthieu Herrb
  *		 2009 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  *    - Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *    - Redistributions in binary form must reproduce the above
  *      copyright notice, this list of conditions and the following
 @@ -406,27 +406,27 @@ IgsProbe(DriverPtr drv, int flags)
 		xf86Msg(X_ERROR, "Aperture at %08x\n", cPtr->fb_paddr);
+	    }
+	}
+    }
     xfree(devSections);
     return foundScreen;
+}
 static Bool
 IgsPreInit(ScrnInfoPtr pScrn, int flags)
+{
 	IgsPtr fPtr;
-	int default_depth, vram_size;
+	int default_depth, vram_size = 2 * 1024 * 1024;
 	char *dev, *s;
 	char *mod = NULL;
 	const char *reqSym = NULL;
 	Gamma zeros = {0.0, 0.0, 0.0};
 	DisplayModePtr mode;
 	MessageType from;
 	if (flags & PROBE_DETECT) return FALSE;
 	TRACE_ENTER("PreInit");
 	if (pScrn->numEntities != 1) return FALSE;

 @@ -11,27 +11,27 @@
  * furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * MICHAEL LORENZ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $NetBSD: igs_accel.c,v 1.2 2009/11/21 22:22:27 macallan Exp $ */
+/* $NetBSD: igs_accel.c,v 1.3 2010/05/20 07:55:20 macallan Exp $ */
 #include <sys/types.h>
 #include "igs.h"
 /*#define DEBUG*/
 #ifdef DEBUG
 #define ENTER xf86Msg(X_ERROR, "%s\n", __func__)
 #define LEAVE xf86Msg(X_ERROR, "%s done\n", __func__)
 #else
 #define ENTER
 #define LEAVE
 @@ -61,61 +61,61 @@ static inline uint8_t IgsRead1(IgsPtr fP
 static inline uint16_t IgsRead2(IgsPtr fPtr, int offset)
+{
 	return *(uint16_t *)(fPtr->reg + offset);
+}
 static void
 IgsWaitMarker(ScreenPtr pScreen, int Marker)
+{
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	IgsPtr fPtr = IGSPTR(pScrn);
 	int bail = 0x0fffffff;
 	ENTER;
-	IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, (fPtr->info.depth >> 3) - 1);
+	IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
 	while ((IgsRead1(fPtr,
 	    IGS_COP_CTL_REG) & (IGS_COP_CTL_BUSY | IGS_COP_CTL_HFEMPTZ) != 0)
 	    && (bail > 0)) {
 		bail--;
-		usleep(1);
+		IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
+	}
 	/* reset the coprocessor if we run into a timeout */
 	if (bail == 0) {
 		xf86Msg(X_ERROR, "%s: timeout\n", __func__);
 		IgsWrite1(fPtr, IGS_COP_CTL_REG, 0);
+	}
 	LEAVE;
+}
 static int
 IgsMarkSync(ScreenPtr pScreenInfo)
+{
 	ENTER;
 	return 0;
+}
 static void
 IgsWaitReady(IgsPtr fPtr)
+{
 	int bail = 0x0fffffff;
 	ENTER;
-	IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, (fPtr->info.depth >> 3) - 1);
+	IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
 	while (((IgsRead1(fPtr,
 	    IGS_COP_CTL_REG) & (IGS_COP_CTL_BUSY | IGS_COP_CTL_HFEMPTZ)) != 0)
 	    && (bail > 0)) {
 		bail--;
-		usleep(1);
+		IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
+	}
 	/* reset the coprocessor if we run into a timeout */
 	if (bail == 0) {
 		xf86Msg(X_ERROR, "%s: timeout\n", __func__);
 		IgsWrite1(fPtr, IGS_COP_CTL_REG, 0);
+	}
 	LEAVE;
+}
 static Bool
 IgsPrepareCopy
+(
 @@ -251,60 +251,64 @@ IgsSolid(
 /*
  * Memcpy-based UTS.
  */
 static Bool
 IgsUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
     char *src, int src_pitch)
+{
 	ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
 	IgsPtr fPtr = IGSPTR(pScrn);
 	char  *dst        = fPtr->fbmem + exaGetPixmapOffset(pDst);
 	int    dst_pitch  = exaGetPixmapPitch(pDst);
 	int bpp    = pDst->drawable.bitsPerPixel;
-	int cpp    = (bpp + 7) / 8;
+	int cpp    = (bpp + 7) >> 3;
 	int wBytes = w * cpp;
 	ENTER;
 	dst += (x * cpp) + (y * dst_pitch);
 	IgsWaitReady(fPtr);
 	while (h--) {
 		memcpy(dst, src, wBytes);
 		src += src_pitch;
 		dst += dst_pitch;
+	}
 	LEAVE;
 	return TRUE;
+}
 /*
  * Memcpy-based DFS.
  */
 static Bool
 IgsDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
     char *dst, int dst_pitch)
+{
 	ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
 	IgsPtr fPtr = IGSPTR(pScrn);
 	char  *src        = fPtr->fbmem + exaGetPixmapOffset(pSrc);
 	int    src_pitch  = exaGetPixmapPitch(pSrc);
 	int bpp    = pSrc->drawable.bitsPerPixel;
-	int cpp    = (bpp + 7) / 8;
+	int cpp    = (bpp + 7) >> 3;
 	int wBytes = w * cpp;
 	ENTER;
 	src += (x * cpp) + (y * src_pitch);
 	IgsWaitReady(fPtr);
 	while (h--) {
 		memcpy(dst, src, wBytes);
 		src += src_pitch;
 		dst += dst_pitch;
+	}
 	LEAVE;
 	return TRUE;
+}
 Bool
 IgsInitAccel(ScreenPtr pScreen)
+{
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 @@ -333,29 +337,37 @@ IgsInitAccel(ScreenPtr pScreen)
 	pExa->MarkSync = IgsMarkSync;
 	pExa->WaitMarker = IgsWaitMarker;
 	pExa->PrepareSolid = IgsPrepareSolid;
 	pExa->Solid = IgsSolid;
 	pExa->DoneSolid = IgsDoneCopy;
 	pExa->PrepareCopy = IgsPrepareCopy;
 	pExa->Copy = IgsCopy;
 	pExa->DoneCopy = IgsDoneCopy;
 	switch(fPtr->info.depth) {
 		case 8:
 			fPtr->shift = 0;
 			fPtr->mapfmt = IGS_COP_MAP_8BPP;
 			break;
 		case 16:
 			fPtr->shift = 1;
 			fPtr->mapfmt = IGS_COP_MAP_16BPP;
 			break;
 		case 24:
 		case 32:
 			fPtr->shift = 2;
 			fPtr->mapfmt = IGS_COP_MAP_32BPP;
 			break;
 		default:
 			ErrorF("Unsupported depth: %d\n", fPtr->info.depth);
+	}
 	IgsWrite1(fPtr, IGS_COP_MAP_FMT_REG, fPtr->mapfmt);
 	/* EXA hits more optimized paths when it does not have to fallback
 	 * because of missing UTS/DFS, hook memcpy-based UTS/DFS.
 	 */
 	pExa->UploadToScreen = IgsUploadToScreen;
 	pExa->DownloadFromScreen = IgsDownloadFromScreen;
 	return exaDriverInit(pScreen, pExa);
+}