 @@ -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: tcx_accel.c,v 1.7 2013/06/04 22:58:31 mrg Exp $ */
+/* $NetBSD: tcx_accel.c,v 1.8 2014/07/02 11:54:48 macallan Exp $ */
 #include <sys/types.h>
 #include "tcx.h"
 #ifdef DEBUG
 #define ENTER xf86Msg(X_ERROR, "%s\n", __func__)
 #define LEAVE xf86Msg(X_ERROR, "%s done\n", __func__)
 #else
 #define ENTER
 #define LEAVE
 #endif
 @@ -331,33 +331,33 @@ TcxInitAccel(ScreenPtr pScreen)
     ExaDriverPtr pExa;
     pExa = exaDriverAlloc();
     if (!pExa)
         return FALSE;
     pTcx->pExa = pExa;
     pExa->exa_major = EXA_VERSION_MAJOR;
     pExa->exa_minor = EXA_VERSION_MINOR;
     /*
      * The S24 can display both 8 and 24bit data at the same time, and in
-     * 24bit we can choose between gamma corrected ad direct. No idea how that
+     * 24bit we can choose between gamma corrected and direct. No idea how that
      * would map to EXA - we'd have to pick the right framebuffer to draw into
      * and Solid() would need to know what kind of pixels to write
      */
     pExa->memoryBase = pTcx->fb;
     if (pScrn->depth == 8) {
-	pExa->memorySize = 1024 * 1024;
+	pExa->memorySize = pTcx->vramsize;
 	pExa->offScreenBase = pTcx->psdp->width * pTcx->psdp->height;
 	pExa->pixmapOffsetAlign = 1;
 	pExa->pixmapPitchAlign = 1;
     } else {
 	pExa->memorySize = 1024 * 1024 * 4;
 	pExa->offScreenBase = pTcx->psdp->width * pTcx->psdp->height * 4;
 	pExa->pixmapOffsetAlign = 4;
 	pExa->pixmapPitchAlign = 4;
+    }
     pExa->flags = EXA_OFFSCREEN_PIXMAPS;
     pExa->maxX = 2048;

 @@ -282,27 +282,27 @@ TCXProbe(DriverPtr drv, int flags)
 	free(pEnt);
+    }
     free(usedChips);
     return foundScreen;
+}
 /* Mandatory */
 static Bool
 TCXPreInit(ScrnInfoPtr pScrn, int flags)
+{
     TcxPtr pTcx;
     sbusDevicePtr psdp = NULL;
     MessageType from;
-    int i;
+    int i, prom;
     int hwCursor, lowDepth;
     if (flags & PROBE_DETECT) return FALSE;
     /*
      * Note: This function is only called once at server startup, and
      * not at the start of each server generation.  This means that
      * only things that are persistent across server generations can
      * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
      * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()
      * are too, and should be used for data that must persist across
      * server generations.
+     *
 @@ -331,38 +331,54 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
 	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
 	    pTcx->psdp = psdp;
 	} else
 	    return FALSE;
+    }
     if (psdp == NULL)
 	return FALSE;
     /**********************
     check card capabilities
     **********************/
     hwCursor = 0;
     lowDepth = 1;
      if (sparcPromInit() >= 0) {
- 	hwCursor = sparcPromGetBool(&psdp->node, "hw-cursor");
+    prom = sparcPromInit();
- 	lowDepth = sparcPromGetBool(&psdp->node, "tcx-8-bit");
+    hwCursor = sparcPromGetBool(&psdp->node, "hw-cursor");
- 	sparcPromClose();
+    lowDepth = sparcPromGetBool(&psdp->node, "tcx-8-bit");
     pTcx->Is8bit = (lowDepth != 0);
     /* all S24 support a hardware cursor */
-    if (!lowDepth)
+    if (!lowDepth) {
 	hwCursor = 1;
 	pTcx->vramsize = 0x100000;	/* size of the 8bit fb */
     } else {
 	char *b;
 	int len = 4, v = 0;
     	/* see if we have more than 1MB vram */
 	pTcx->vramsize = 0x100000;
 	if ((b = sparcPromGetProperty(&psdp->node, "vram", &len)) != NULL) {
 	    memcpy(&v, b, 4);
 	    if ((v > 0) && (v < 3))
 	    	pTcx->vramsize = 0x100000 * v;
+	}
 	xf86Msg(X_ERROR, "found %d MB video memory\n", v);
+    }
     if (prom)
     	sparcPromClose();
-	xf86Msg(X_ERROR, "hw-cursor: %d\n", hwCursor);
+    xf86Msg(X_ERROR, "hw-cursor: %d\n", hwCursor);
     /*********************
     deal with depth
     *********************/
     if (!xf86SetDepthBpp(pScrn, lowDepth ? 8 : 0, 0, 0,
 			 lowDepth ? NoDepth24Support : Support32bppFb)) {
 	return FALSE;
     } else {
 	/* Check that the returned depth is one we support */
 	switch (pScrn->depth) {
 	case 8:
 	    /* OK */
 @@ -498,51 +514,51 @@ TCXScreenInit(SCREEN_INIT_ARGS_DECL)
     VisualPtr visual;
     int ret;
     /*
      * First get the ScrnInfoRec
      */
     pScrn = xf86ScreenToScrn(pScreen);
     pTcx = GET_TCX_FROM_SCRN(pScrn);
     /* Map the TCX memory */
     if (pScrn->depth == 8) {
 	pTcx->fb =
-	    xf86MapSbusMem (pTcx->psdp, TCX_RAM8_VOFF, 1024 * 1024);
+	    xf86MapSbusMem (pTcx->psdp, TCX_RAM8_VOFF, pTcx->vramsize);
 	pTcx->pitchshift = 0;
     } else {
 	pTcx->fb =
 	    xf86MapSbusMem (pTcx->psdp, TCX_RAM24_VOFF, 1024 * 1024 * 4);
 	pTcx->cplane =
 	    xf86MapSbusMem (pTcx->psdp, TCX_CPLANE_VOFF, 1024 * 1024 * 4);
 	pTcx->pitchshift = 2;
 	if (! pTcx->cplane)
 	    return FALSE;
+    }
     if (pTcx->HWCursor == TRUE) {
 	pTcx->thc = xf86MapSbusMem (pTcx->psdp, TCX_THC_VOFF, 8192);
 	if (! pTcx->thc)
 	    return FALSE;
+    }
     if (pTcx->Is8bit) {
     	/* use STIP and BLIT on tcx */
-        pTcx->rblit = xf86MapSbusMem(pTcx->psdp, TCX_BLIT_VOFF, 8 * 1024 * 1024);
+        pTcx->rblit = xf86MapSbusMem(pTcx->psdp, TCX_BLIT_VOFF, 8 * pTcx->vramsize);
         if (pTcx->rblit == NULL) {
 	    xf86Msg(X_ERROR, "Couldn't map BLIT space\n");
 	    return FALSE;
+        }
-        pTcx->rstip = xf86MapSbusMem(pTcx->psdp, TCX_STIP_VOFF, 8 * 1024 * 1024);
+        pTcx->rstip = xf86MapSbusMem(pTcx->psdp, TCX_STIP_VOFF, 8 * pTcx->vramsize);
         if (pTcx->rstip == NULL) {
 	    xf86Msg(X_ERROR, "Couldn't map STIP space\n");
 	    return FALSE;
+	}
     } else {
     	/* use RSTIP and RBLIT on S24 */
         pTcx->rblit = xf86MapSbusMem(pTcx->psdp, TCX_RBLIT_VOFF, 8 * 1024 * 1024);
         if (pTcx->rblit == NULL) {
 	    xf86Msg(X_ERROR, "Couldn't map RBLIT space\n");
 	    return FALSE;
+        }
         pTcx->rstip = xf86MapSbusMem(pTcx->psdp, TCX_RSTIP_VOFF, 8 * 1024 * 1024);
         if (pTcx->rstip == NULL) {

 @@ -49,26 +49,27 @@
 #define TCX_ALT_VOFF		0x7000a000
 #define TCX_SYNC_VOFF		0x7000e000
 typedef struct {
 	unsigned char	*fb;
 	int		width;
 	int		height;
 	unsigned int	*cplane;
 	TcxThcPtr	thc;
 	sbusDevicePtr	psdp;
 	CloseScreenProcPtr CloseScreen;
 	Bool		HWCursor;
 	Bool		Is8bit;
 	int		vramsize;	/* size of the 8bit fb */
 	uint64_t	*rblit;
 	uint64_t	*rstip;
 	xf86CursorInfoPtr CursorInfoRec;
 	unsigned int	CursorXY;
 	int		CursorBg, CursorFg;
 	Bool		CursorEnabled, NoAccel;
 	unsigned char	CursorShiftX, CursorShiftY;
 	unsigned char	*CursorData;
 	OptionInfoPtr	Options;
 	ExaDriverPtr	pExa;
 	int		xdir, ydir, srcoff, srcpitch, fg, pitchshift;
 } TcxRec, *TcxPtr;