rpms/xorg-x11-drv-ati/devel r600-enable-mixed.patch, NONE, 1.1 r600-fix-exa-crash.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.185, 1.186

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10812

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	r600-enable-mixed.patch r600-fix-exa-crash.patch 
Log Message:
* Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.4.20090908git651fe5a47
- fix EXA server crasher + use mixed pixmaps for speed ups


r600-enable-mixed.patch:
 r600_exa.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE r600-enable-mixed.patch ---
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 86da68c..4e42509 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2330,9 +2330,9 @@ R600DrawInit(ScreenPtr pScreen)
 #ifdef EXA_HANDLES_PIXMAPS
     if (info->cs) {
 	info->accel_state->exa->flags |= EXA_HANDLES_PIXMAPS;
-//#ifdef EXA_MIXED_PIXMAPS
-//	info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS;
-//#endif
+#ifdef EXA_MIXED_PIXMAPS
+	info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS;
+#endif
     }
 #endif
 #endif

r600-fix-exa-crash.patch:
 r6xx_accel.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE r600-fix-exa-crash.patch ---
>From 0bb0ff0e55aaf8e64017d204e376a14f0a7384a3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Thu, 10 Sep 2009 11:48:00 +1000
Subject: [PATCH] r6xx: fix EXA crash with gtkperf -a

unmapping was getting unbalanced.
---
 src/r6xx_accel.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index 985595e..3202d51 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -48,7 +48,7 @@ void r600_cs_flush_indirect(ScrnInfoPtr pScrn)
     if (!info->cs->cdw)
 	return;
 
-    if (info->accel_state->vb_bo) {
+    if (info->accel_state->vb_ptr) {
 	radeon_bo_unmap(info->accel_state->vb_bo);
 	info->accel_state->vb_ptr = NULL;
     }
@@ -106,9 +106,10 @@ void R600IBDiscard(ScrnInfoPtr pScrn, drmBufPtr ib)
     int ret;
     RADEONInfoPtr info = RADEONPTR(pScrn);
     if (info->cs) {
-	if (info->accel_state->vb_bo)
+	if (info->accel_state->vb_ptr) {
 	    radeon_bo_unmap(info->accel_state->vb_bo);
-	info->accel_state->vb_bo = NULL;
+	    info->accel_state->vb_ptr = NULL;
+        }
 	if (CS_FULL(info->cs)) {
 	    r600_cs_flush_indirect(pScrn);
 	    return;
-- 
1.6.4.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- xorg-x11-drv-ati.spec	8 Sep 2009 03:38:52 -0000	1.185
+++ xorg-x11-drv-ati.spec	10 Sep 2009 01:57:37 -0000	1.186
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.3.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.4.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,6 +21,8 @@ Source1:    mkxinf
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
+Patch14:    r600-enable-mixed.patch
+Patch15:    r600-fix-exa-crash.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +49,8 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
+%patch14 -p1 -b .mix
+%patch15 -p1 -b .fixexa
 
 %build
 autoreconf -iv
@@ -80,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 10 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.4.20090908git651fe5a47
+- fix EXA server crasher + use mixed pixmaps for speed ups
+
 * Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.3.20090908git651fe5a47
 - New snapshot with r600 kms support