[patch] Fix improper test for failure in ScreenInit (sunffb) and trace Screen setup

ffb-trace.patch (text/plain), 3.04 KB, created by Ferris McCormick (RETIRED) on 2003-02-10 15:01:53 UTC

--- ffb_driver.c.orig	2001-05-04 19:05:46.000000000 +0000
+++ ffb_driver.c	2003-02-10 12:46:29.000000000 +0000
@@ -670,8 +670,18 @@
     VisualPtr visual;
 
     /* Add in our Dbe hook. */
-    if (!FFBDbePreInit(pScreen))
+    xf86Msg(X_INFO,"%s: Enter\n","FFBScreenInit");
+    if (!FFBDbePreInit(pScreen)) {
+    	xf86Msg(X_INFO,"%s: (Spurious) failure\n","FFBFFBDbePrenit");
+	/*
+	FFBDbePreInit thinks it returns a status from DbeRegisterFunction,
+	but the only DbeRegisterFunction I know of is in libdre.a, and
+	that function is "void DbeRegisterFunction(..." and it returns
+	no status in particular.  Hence, my belief that this status return
+	is meaningless. --- FEM
 	return FALSE;
+	*/
+	}
 
     /* 
      * First get the ScrnInfoRec
@@ -682,6 +692,13 @@
 
     /* Map the FFB framebuffer, for each view. */
 
+    /*
+    Now, we are going to try to map frame buffer memory.
+    So, let's note each attempt.
+    */
+
+    xf86Msg(X_INFO,"%s: DFB24_VOFF\n",pFfb->psdp->device);
+    
     /* 24-bit RGB Dumb view */
     pFfb->fb = pFfb->dfb24 =
 	xf86MapSbusMem (pFfb->psdp, FFB_DFB24_VOFF, 0x1000000);
@@ -690,6 +707,7 @@
 	return FALSE;
 
     /* 8-bit R Dumb view */
+    xf86Msg(X_INFO,"%s: DFB8R_VOFF\n",pFfb->psdp->device);
     pFfb->dfb8r =
 	xf86MapSbusMem (pFfb->psdp, FFB_DFB8R_VOFF, 0x400000);
 
@@ -697,6 +715,7 @@
 	return FALSE;
 
     /* 8-bit X Dumb view */
+    xf86Msg(X_INFO,"%s: DFB8X_VOFF\n",pFfb->psdp->device);
     pFfb->dfb8x =
 	xf86MapSbusMem (pFfb->psdp, FFB_DFB8X_VOFF, 0x400000);
 
@@ -704,6 +723,7 @@
 	return FALSE;
 
     /* 32-bit RGB Smart view */
+    xf86Msg(X_INFO,"%s: SFB32_VOFF\n",pFfb->psdp->device);
     pFfb->sfb32 =
 	xf86MapSbusMem (pFfb->psdp, FFB_SFB32_VOFF, 0x1000000);
 
@@ -711,6 +731,7 @@
 	return FALSE;
 
     /* 8-bit R Smart view */
+    xf86Msg(X_INFO,"%s: SFB8R_VOFF\n",pFfb->psdp->device);
     pFfb->sfb8r =
 	xf86MapSbusMem(pFfb->psdp, FFB_SFB8R_VOFF, 0x400000);
 
@@ -718,6 +739,7 @@
 	return FALSE;
 
     /* 8-bit X Smart view */
+    xf86Msg(X_INFO,"%s: SFB8X_VOFF\n",pFfb->psdp->device);
     pFfb->sfb8x =
 	xf86MapSbusMem(pFfb->psdp, FFB_SFB8X_VOFF, 0x400000);
 
@@ -725,6 +747,7 @@
 	return FALSE;
 
     /* Map the rendering pipeline */
+    xf86Msg(X_INFO,"%s: FBC_REGS_VOFF\n",pFfb->psdp->device);
     pFfb->regs =
 	xf86MapSbusMem (pFfb->psdp, FFB_FBC_REGS_VOFF, 16384);
 
@@ -732,6 +755,7 @@
 	return FALSE;
 
     /* Map the ramdac */
+    xf86Msg(X_INFO,"%s: DAC_VOFF\n",pFfb->psdp->device);
     pFfb->dac =
 	xf86MapSbusMem (pFfb->psdp, FFB_DAC_VOFF, 8192);
 
@@ -739,6 +763,7 @@
 	return FALSE;
 
     /* Map the board strapping bits */
+    xf86Msg(X_INFO,"%s: EXP_VOFF\n",pFfb->psdp->device);
     pFfb->strapping_bits = (volatile unsigned int *)
 	    xf86MapSbusMem(pFfb->psdp, FFB_EXP_VOFF, 8192);
 
@@ -746,6 +771,8 @@
 	return FALSE;
 
     /* Probe for the type of FFB/AFB we have. */
+    /* OK, now we should start getting useful messages again, because
+       Probe... explains what it is finding. */
     FFBProbeBoardType(pFfb);
 
     /* Now that we have the board type, we can init the ramdac layer. */