From b4b3d379ea6b4216ecf986c9a803ba5b553d8106 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Sep 25 2008 05:47:57 +0000
Subject: - fix crash with x11perf on r500 modesetting


---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index cd8634e..cf1fa6d 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -46,6 +46,7 @@ Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
 # XXX does this need rebasing still?
 Patch102:  xserver-1.5.0-exa-master-upgrade.patch
 Patch103:  xserver-1.5.0-bg-none-root.patch
+Patch104:  xserver-1.5.0-exa-master-fix-x11perf-crash.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -500,6 +501,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 25 2008 Dave Airlie <airlied@redhat.com> 1.5.1-2
+- fix crash with x11perf on r500 modesetting
+
 * Tue Sep 23 2008 Adam Jackson <ajax@redhat.com> 1.5.1-1
 - xserver 1.5.1
 - Trim %%changelog.
diff --git a/xserver-1.5.0-exa-master-fix-x11perf-crash.patch b/xserver-1.5.0-exa-master-fix-x11perf-crash.patch
new file mode 100644
index 0000000..80f7e98
--- /dev/null
+++ b/xserver-1.5.0-exa-master-fix-x11perf-crash.patch
@@ -0,0 +1,26 @@
+From 99838fad3c826c95736f93fc4f9492fbb93f9205 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Thu, 25 Sep 2008 15:40:19 +1000
+Subject: [PATCH] exa: make sure pixmap devPrivate.ptr is NULL at create time
+
+---
+ exa/exa.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/exa/exa.c b/exa/exa.c
+index 6e769a7..d240126 100644
+--- a/exa/exa.c
++++ b/exa/exa.c
+@@ -325,6 +325,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
+         pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
+         pExaPixmap->fb_ptr = NULL;
+         pExaPixmap->pDamage = NULL;
++        pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
++        pPixmap->devPrivate.ptr = NULL;
++
+     } else {
+         pExaPixmap->driverPriv = NULL;
+         /* Scratch pixmaps may have w/h equal to zero, and may not be
+-- 
+1.5.5.1
+