diff options
| author | Jesse Barnes <jesse.barnes@intel.com> | 2007-08-10 15:53:04 -0400 |
|---|---|---|
| committer | Jesse Barnes <jesse.barnes@intel.com> | 2007-08-10 15:53:04 -0400 |
| commit | f71b9358b4157a8cfdc694ddef8ca3f98926ca91 (patch) | |
| tree | 39fc4178563dfde626c0ad842637bfce6e3250e1 | |
| parent | e6746d0f286ef9d9a87f748d40e5421c268f2f7d (diff) | |
| download | xorg-driver-xf86-video-intel-f71b9358b4157a8cfdc694ddef8ca3f98926ca91.tar.gz | |
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.
| -rw-r--r-- | src/i830_driver.c | 2 | ||||
| -rw-r--r-- | 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"); |