[PATCH 1/4] Fix RADEON_FALLBACK logging

Grigori Goronzy greg at chown.ath.cx
Sun Jul 21 21:06:03 PDT 2013


---
 src/evergreen_exa.c     |  4 ++--
 src/r600_exa.c          |  4 ++--
 src/radeon_exa_render.c | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index bd57135..86f455d 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -1134,7 +1134,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
     if (!pSrc) {
 	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
 	if (!pSrc)
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
     }
 
     dst_obj.bo = radeon_get_pixmap_bo(pDst);
@@ -1165,7 +1165,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
 	    if (!pMask) {
 		if (!pSrcPicture->pDrawable)
 		    pScreen->DestroyPixmap(pSrc);
-		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+		RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
 	    }
 	}
 	mask_obj.bo = radeon_get_pixmap_bo(pMask);
diff --git a/src/r600_exa.c b/src/r600_exa.c
index fbb1383..b243234 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -1179,7 +1179,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
     if (!pSrc) {
 	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
 	if (!pSrc)
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
     }
 
     dst_obj.bo = radeon_get_pixmap_bo(pDst);
@@ -1211,7 +1211,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
 	    if (!pMask) {
 		if (!pSrcPicture->pDrawable)
 		    pScreen->DestroyPixmap(pSrc);
-		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+		RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
 	    }
 	}
 
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 1f6b86d..9510f7f 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -602,7 +602,7 @@ static Bool R100PrepareComposite(int op,
     if (!pSrc) {
 	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
 	if (!pSrc)
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
     }
 
     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
@@ -616,7 +616,7 @@ static Bool R100PrepareComposite(int op,
 	if (!pMask) {
 	    if (!pSrcPicture->pDrawable)
 		pScreen->DestroyPixmap(pSrc);
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
 	}
     }
 
@@ -967,7 +967,7 @@ static Bool R200PrepareComposite(int op, PicturePtr pSrcPicture,
     if (!pSrc) {
 	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
 	if (!pSrc)
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
     }
 
     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
@@ -978,7 +978,7 @@ static Bool R200PrepareComposite(int op, PicturePtr pSrcPicture,
 	if (!pMask) {
 	    if (!pSrcPicture->pDrawable)
 		pScreen->DestroyPixmap(pSrc);
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
 	}
     }
 
@@ -1459,7 +1459,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
     if (!pSrc) {
 	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
 	if (!pSrc)
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
     }
 
     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
@@ -1470,7 +1470,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
 	if (!pMask) {
 	    if (!pSrcPicture->pDrawable)
 		pScreen->DestroyPixmap(pSrc);
-	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
+	    RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
 	}
     }
 
-- 
1.8.1.2



More information about the xorg-driver-ati mailing list