glamo* : call correct initialiation function from kdrive and add more debug info

4 files changed, 29 insertions, 14 deletions

diff --git a/src/glamo-cmdq.c b/src/glamo-cmdq.c
index 42cf0e6..bcf8472 100644
--- a/src/glamo-cmdq.c
+++ b/src/glamo-cmdq.c
@@ -278,7 +278,7 @@ GLAMOEngineWaitReal(GlamoPtr pGlamo,
 		GLAMO_LOG_ERROR("Timeout idling accelerator "
 				"(0x%x), resetting...\n",
 				status);
-		GLAMODumpRegs(pGlamo, 0x1600, 0x1612);
+		/*GLAMODumpRegs(pGlamo, 0x1600, 0x1612);*/
 		GLAMOEngineReset(pGlamo, GLAMO_ENGINE_CMDQ);
 		GLAMOEngineEnable(pGlamo, GLAMO_ENGINE_2D);
         GLAMOEngineReset(pGlamo, GLAMO_ENGINE_2D);
@@ -338,7 +338,7 @@ GLAMODispatchCMDQCache(GlamoPtr pGlamo)
 		pGlamo->ring_write++; addr++;
 		if (pGlamo->ring_write >= ring_count) {
 			GLAMO_LOG_ERROR("wrapped over ring_write\n");
-			GLAMODumpRegs(pGlamo, 0x1600, 0x1612);
+			/*GLAMODumpRegs(pGlamo, 0x1600, 0x1612);*/
 			pGlamo->ring_write = 0;
 		}
 		count--;
@@ -346,7 +346,7 @@ GLAMODispatchCMDQCache(GlamoPtr pGlamo)
 	if (TIMEDOUT()) {
 		GLAMO_LOG_ERROR("Timeout submitting packets, "
 				"resetting...\n");
-		GLAMODumpRegs(pGlamo, 0x1600, 0x1612);
+		/*GLAMODumpRegs(pGlamo, 0x1600, 0x1612);*/
 		GLAMOEngineReset(pGlamo, GLAMO_ENGINE_CMDQ);
 		GLAMODrawSetup(pGlamo);
 	}
@@ -453,14 +453,14 @@ void
 GLAMOCMDQCacheSetup(GlamoPtr pGlamo)
 {
 	xf86DrvMsg(0, X_WARNING,
-			"here1\n");
+			"GLAMOCMDQCacheSetup here1\n");
 	GLAMOCMDQInit(pGlamo, TRUE);
 	xf86DrvMsg(0, X_WARNING,
-			"here2\n");
+			"GLAMOCMDQCacheSetup here2\n");
 	if (pGlamo->cmd_queue_cache)
 		return;
 	xf86DrvMsg(0, X_WARNING,
-			"here3\n");
+			"GLAMOCMDQCacheSetup here3\n");
 	pGlamo->cmd_queue_cache = GLAMOCreateCMDQCache(pGlamo);
 	if (pGlamo->cmd_queue_cache == FALSE)
 		FatalError("Failed to allocate cmd queue cache buffer.\n");
diff --git a/src/glamo-draw.c b/src/glamo-draw.c
index 174e2d1..60353da 100644
--- a/src/glamo-draw.c
+++ b/src/glamo-draw.c
@@ -170,6 +170,21 @@ GLAMOWakeupHandler(pointer blockData, int result, pointer readmask)
 {
 }
 
+void
+GLAMODrawSetup(GlamoPtr pGlamo)
+{
+	GLAMOEngineEnable(pGlamo, GLAMO_ENGINE_2D);
+	GLAMOEngineReset(pGlamo, GLAMO_ENGINE_2D);
+}
+
+void
+GLAMODrawEnable(GlamoPtr pGlamo)
+{
+	GLAMOCMDQCacheSetup(pGlamo);
+	GLAMODrawSetup(pGlamo);
+	GLAMOEngineWait(pGlamo->pScreen, GLAMO_ENGINE_ALL);
+}
+
 Bool
 GLAMODrawExaInit(ScreenPtr pScreen, ScrnInfoPtr pScrn)
 {
@@ -377,15 +392,15 @@ GLAMOExaCopy(PixmapPtr       pDst,
 		  srcX, srcY, dstX, dstY,
 		  width, height);
 
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			"here1\n");
+/*	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			"GLAMOExaCopy here1\n");*/
 	BEGIN_CMDQ(34);
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			"here2\n");
+/*	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			"GLAMOExaCopy here2\n");*/
 
 	OUT_REG(GLAMO_REG_2D_SRC_ADDRL, pGlamo->src_offset & 0xffff);
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			"here3\n");
+/*	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			"GLAMOExaCopy here3\n");*/
 
 	OUT_REG(GLAMO_REG_2D_SRC_ADDRH, (pGlamo->src_offset >> 16) & 0x7f);
 	OUT_REG(GLAMO_REG_2D_SRC_PITCH, pGlamo->src_pitch);
diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index 41727c4..2d2d4c0 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -747,7 +747,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 		return FALSE;
 	}
 
-	GLAMOCMDQCacheSetup(fPtr);
+	GLAMODrawEnable(fPtr);
 
 	xf86SetBlackWhitePixels(pScreen);
 	miInitializeBackingStore(pScreen);
diff --git a/src/glamo.h b/src/glamo.h
index 76a3f1d..115d539 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -214,7 +214,7 @@ Bool
 GLAMODrawInit(ScreenPtr pScreen);
 
 void
-GLAMODrawEnable(ScreenPtr pScreen);
+GLAMODrawEnable(GlamoPtr pScreen);
 
 void
 GLAMODrawDisable(ScreenPtr pScreen);