summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-12-01 18:00:17 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2006-12-01 18:00:17 +0100
commit3933b86390eb2f4198d490acd4914fb470c40f47 (patch)
tree8eecd145aac3255497955cb272324d625bedd8b1
parent563dfb52f5b24d2f765fae0394e599c11dcf0b5b (diff)
Make log file output clear about origin of used overlay scaler buffer width.
-rw-r--r--src/radeon_driver.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index ee506ee..686c782 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3055,10 +3055,14 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
(info->overlay_scaler_buffer_width > 2048) ||
((info->overlay_scaler_buffer_width % 64) != 0)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Attempt to set illegal scaler width. Using default\n");
+ from = X_DEFAULT;
info->overlay_scaler_buffer_width = 0;
- }
+ } else
+ from = X_CONFIG;
+ } else {
+ from = X_DEFAULT;
+ info->overlay_scaler_buffer_width = 0;
}
- else info->overlay_scaler_buffer_width = 0;
if (!info->overlay_scaler_buffer_width) {
/* overlay scaler line length differs for different revisions
this needs to be maintained by hand */
@@ -3072,7 +3076,7 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
info->overlay_scaler_buffer_width = 1536;
}
}
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Assuming overlay scaler buffer width is %d\n",
+ xf86DrvMsg(pScrn->scrnIndex, from, "Assuming overlay scaler buffer width is %d\n",
info->overlay_scaler_buffer_width);
if(info->tunerType>31){