From f71b9358b4157a8cfdc694ddef8ca3f98926ca91 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 10 Aug 2007 15:53:04 -0400 Subject: [PATCH] Cleanup tiling and FBC driver output. Remove an extra "FBC enabled" message from i830_memory.c (only report errors if they occur), and don't print the "forcing FBC on" message if tiling was already enabled, as it's redundant and confusing. --- src/i830_driver.c | 2 +- src/i830_memory.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/i830_driver.c b/src/i830_driver.c index 693e12ab..6a03ff6d 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2275,7 +2275,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pI830->fb_compression = FALSE; } - if (pI830->fb_compression) { + if (pI830->fb_compression && !pI830->tiling) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Framebuffer compression enabled, " "forcing tiling on.\n"); pI830->tiling = TRUE; diff --git a/src/i830_memory.c b/src/i830_memory.c index ccd26b39..93b054cb 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1073,10 +1073,7 @@ static void i830_setup_fb_compression(ScrnInfoPtr pScrn) } out: - if (pI830->fb_compression) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Framebuffer compression " - "enabled\n"); - else + if (!pI830->fb_compression) xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Allocation error, framebuffer" " compression disabled\n");