xf86-video-ati: Branch 'master' - 3 commits

[Michel Daenzer]

 src/radeon_driver.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

New commits:
diff-tree 3933b86390eb2f4198d490acd4914fb470c40f47 (from 563dfb52f5b24d2f765fae0394e599c11dcf0b5b)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Fri Dec 1 18:00:17 2006 +0100

    Make log file output clear about origin of used overlay scaler buffer width.

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
 	  (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
 		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){
diff-tree 563dfb52f5b24d2f765fae0394e599c11dcf0b5b (from 984ea3d9b7c27d8183ca94ad9d7905f03613fe10)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Fri Dec 1 17:56:19 2006 +0100

    Increase default overlay scaler buffer width for RV350.
    
    Works with 1920x1080 video on my M10.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index a1f0440..ee506ee 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3065,6 +3065,7 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr
 	switch(info->ChipFamily){
 	case CHIP_FAMILY_R200:
 	case CHIP_FAMILY_R300:
+	case CHIP_FAMILY_RV350:
 		info->overlay_scaler_buffer_width = 1920;
 		break;
 	default:
diff-tree 984ea3d9b7c27d8183ca94ad9d7905f03613fe10 (from 9f5ea3981449f29ff204eb154166e8fc813205fa)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Fri Dec 1 17:42:23 2006 +0100

    Fix build warning.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 251c439..a1f0440 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3749,7 +3749,7 @@ _X_EXPORT Bool RADEONScreenInit(int scrn
     char*          s;
 #endif
 
-    RADEONTRACE(("RADEONScreenInit %lx %ld %lx\n",
+    RADEONTRACE(("RADEONScreenInit %lx %ld %d\n",
 		 pScrn->memPhysBase, pScrn->fbOffset, info->frontOffset));
 
     info->accelOn      = FALSE;