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

[Dave Airlie]

 src/radeon_driver.c |    4 +---
 src/radeon_render.c |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 197a62704742a4a19736c2637ac92d1dc5ab34ed
Author: Adam Jackson <ajackson at redhat.com>
Date:   Thu Nov 22 20:26:23 2007 +1000

    radeon: fix openoffice/render bug on r100 chips

diff --git a/src/radeon_render.c b/src/radeon_render.c
index 5074fe1..490dec1 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -392,7 +392,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
 #endif
     ACCEL_PREAMBLE();
 
-    if ((width > 2048) || (height > 2048))
+    if ((width > 2047) || (height > 2047))
 	return FALSE;
 
     txformat = RadeonGetTextureFormat(format);
@@ -424,7 +424,7 @@ static Bool FUNC_NAME(R100SetupTexture)(
 	txformat |= ATILog2(width) << RADEON_TXFORMAT_WIDTH_SHIFT;
 	txformat |= ATILog2(height) << RADEON_TXFORMAT_HEIGHT_SHIFT;
     } else {
-	tex_size = ((height - 1) << 16) | (width - 1);
+	tex_size = (height << 16) | width;
 	txformat |= RADEON_TXFORMAT_NON_POWER2;
     }
 
commit 64010fc4eae8359c01e430f64252931242c91435
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Nov 22 20:25:31 2007 +1000

    Revert "Disable RENDER acceleration by default on some RV200 chips."
    
    This reverts commit 145da701bf4fb9c0ad9f95620b20914ae0126852.
    
    pull in fix from ajax next commit

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c939a5c..c55b5a5 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1704,9 +1704,7 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
 #ifdef RENDER
     info->RenderAccel = xf86ReturnOptValBool(info->Options, OPTION_RENDER_ACCEL,
 					     info->Chipset != PCI_CHIP_RN50_515E &&
-					     info->Chipset != PCI_CHIP_RN50_5969 &&
-					     info->Chipset != PCI_CHIP_RV200_QW &&
-					     info->Chipset != PCI_CHIP_RADEON_LW);
+					     info->Chipset != PCI_CHIP_RN50_5969);
 #endif
 
     return TRUE;