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

[Michel Daenzer]

 src/radeon_dri.c    |    5 +++++
 src/radeon_driver.c |    5 +++--
 src/radeon_video.c  |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
diff-tree 1159c85861dc507ebf323aca82e32fcc67726420 (from 11bedb7c845fc6074383890d5525315aebe05f2c)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sun Jul 2 18:24:28 2006 +0200

    Bug #6548: Fix playback of interlaced video with more than 1023 lines.
    
    This will still break with 2048 lines...

diff --git a/src/radeon_video.c b/src/radeon_video.c
index 07270a1..5d3238b 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2418,7 +2418,7 @@ RADEONDisplayVideo(
 ){
     RADEONInfoPtr info = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
-    int v_inc, h_inc, h_inc_uv, step_by_y, step_by_uv, tmp;
+    CARD32 v_inc, h_inc, h_inc_uv, step_by_y, step_by_uv, tmp;
     double h_inc_d;
     int p1_h_accum_init, p23_h_accum_init;
     int p1_v_accum_init;
diff-tree 11bedb7c845fc6074383890d5525315aebe05f2c (from 4a0c22e32901a510c7aad070be25c31519c284e3)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sun Jul 2 17:03:23 2006 +0200

    Bug #6939: Disable RENDER acceleration by default on RN50.
    
    Based on patch from Weixing Zhang, but still allows enabling it with Option
    "RenderAccel".

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 149cb2e..a3aae4b 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3025,8 +3025,9 @@ static Bool RADEONPreInitChipType(ScrnIn
 		   "Option ShowCache enabled\n");
 
 #ifdef RENDER
-    info->RenderAccel = xf86ReturnOptValBool (info->Options,
-					      OPTION_RENDER_ACCEL, TRUE);
+    info->RenderAccel = xf86ReturnOptValBool(info->Options, OPTION_RENDER_ACCEL,
+					     info->Chipset != PCI_CHIP_RN50_515E &&
+					     info->Chipset != PCI_CHIP_RN50_5969);
 #endif
 
     return TRUE;
diff-tree 4a0c22e32901a510c7aad070be25c31519c284e3 (from 9c4a1e3300d30b23806988aa9328fc6ef92e2663)
Author: Weixing Zhang <anzhang at ati.com>
Date:   Sun Jul 2 16:55:25 2006 +0200

    Bug #6939: Disable 3D acceleration on RN50 by setting invalid ClientDriverName.

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index b644659..8e159d2 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1370,6 +1370,11 @@ Bool RADEONDRIScreenInit(ScreenPtr pScre
     } else    
     if ( info->ChipFamily >= CHIP_FAMILY_R200 )
        pDRIInfo->clientDriverName	 = R200_DRIVER_NAME;
+    else if ((info->Chipset == PCI_CHIP_RN50_515E) || 
+             (info->Chipset == PCI_CHIP_RN50_5969)) {
+        /* RN50 doesn't support 3D, so setting clientDriverName to an invalid name "RN50" */
+        pDRIInfo->clientDriverName       = "RN50";          
+    }
     else 
        pDRIInfo->clientDriverName	 = RADEON_DRIVER_NAME;