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

[Alex Deucher]

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

New commits:
commit b34df233115c0d82d7bcf82e041afbc55981ce82
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue May 26 17:47:01 2009 -0400

    R3xx/R4xx: increase EXA render target limits
    
    now that we are using 1/12 subpixel mode

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 68f9514..bbe3a68 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1245,8 +1245,8 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
     } else {
 	max_tex_w = 2048;
 	max_tex_h = 2048;
-	max_dst_w = 2560;
-	max_dst_h = 2560;
+	max_dst_w = 4021;
+	max_dst_h = 4021;
     }
 
     if (pSrcPixmap->drawable.width > max_tex_w ||
commit 1457bc089d1395d18cf582a4d52444005f013753
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Tue May 26 17:21:07 2009 -0400

    radeon: fix segfault if Option "NoAccel" is set

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 8a2a978..9a1d4d7 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2145,6 +2145,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 	    }
 	}
 #endif /* USE_XAA */
+    } else {
+	/* NoAccel */
+	info->useEXA = FALSE;
     }
 
     return TRUE;