rpms/xorg-x11-server/devel xserver-1.5.0-exa-master-fix-x11perf-crash.patch, NONE, 1.1 xorg-x11-server.spec, 1.353, 1.354

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-exa-master-fix-x11perf-crash.patch 
Log Message:
- fix crash with x11perf on r500 modesetting


xserver-1.5.0-exa-master-fix-x11perf-crash.patch:

--- NEW FILE xserver-1.5.0-exa-master-fix-x11perf-crash.patch ---
>From 99838fad3c826c95736f93fc4f9492fbb93f9205 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at 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



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- xorg-x11-server.spec	23 Sep 2008 19:36:20 -0000	1.353
+++ xorg-x11-server.spec	25 Sep 2008 05:47:57 -0000	1.354
@@ -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 @@
 # 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 @@
 
 
 %changelog
+* Thu Sep 25 2008 Dave Airlie <airlied at redhat.com> 1.5.1-2
+- fix crash with x11perf on r500 modesetting
+
 * Tue Sep 23 2008 Adam Jackson <ajax at redhat.com> 1.5.1-1
 - xserver 1.5.1
 - Trim %%changelog.