Add options to disable EXA acceleration for Composite/UTS/DFS, and always print

out how much memory EXA is managing for offscreen pixmaps.

2 files changed, 20 insertions, 5 deletions

diff --git a/exa/exa.c b/exa/exa.c
index 75d5c0d69..4b96af815 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -623,6 +623,10 @@ exaDriverInit (ScreenPtr		pScreen,
 
         pExaScr->SavedDestroyPixmap = pScreen->DestroyPixmap;
 	pScreen->DestroyPixmap = exaDestroyPixmap;
+
+	LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %d bytes\n",
+		   pScreen->myNum,
+		   pExaScr->info->memorySize - pExaScr->info->offScreenBase);
     }
     else
     {
@@ -641,6 +645,22 @@ exaDriverInit (ScreenPtr		pScreen,
         }
     }
 
+    LogMessage(X_INFO, "EXA(%d): Driver registered support for the following"
+	       " operations:\n", pScreen->myNum);
+    assert(pScreenInfo->PrepareSolid != NULL);
+    LogMessage(X_INFO, "        Solid\n");
+    assert(pScreenInfo->PrepareCopy != NULL);
+    LogMessage(X_INFO, "        Copy\n");
+    if (pScreenInfo->PrepareComposite != NULL) {
+	LogMessage(X_INFO, "        Composite (RENDER acceleration)\n");
+    }
+    if (pScreenInfo->UploadToScreen != NULL) {
+	LogMessage(X_INFO, "        UploadToScreen\n");
+    }
+    if (pScreenInfo->DownloadFromScreen != NULL) {
+	LogMessage(X_INFO, "        DownloadFromScreen\n");
+    }
+
     return TRUE;
 }
 
diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index b55802e1e..9e0aa5d25 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -413,7 +413,6 @@ exaOffscreenInit (ScreenPtr pScreen)
     if (!area)
 	return FALSE;
 
-
     area->state = ExaOffscreenAvail;
     area->base_offset = pExaScr->info->offScreenBase;
     area->offset = area->base_offset;
@@ -422,10 +421,6 @@ exaOffscreenInit (ScreenPtr pScreen)
     area->next = NULL;
     area->score = 0;
 
-#if DEBUG_OFFSCREEN
-    ErrorF("============ initial memory block of %d\n", area->size);
-#endif
-
     /* Add it to the free areas */
     pExaScr->info->offScreenAreas = area;