rpms/xorg-x11-drv-amd/F-7 fix-potential-CPU-GP-race-in-lx_get_source_color.patch, NONE, 1.1 sources, 1.9, 1.10 xorg-x11-drv-amd.spec, 1.15, 1.16 lx-downscaling-fix.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv308

Modified Files:
	sources xorg-x11-drv-amd.spec 
Added Files:
	fix-potential-CPU-GP-race-in-lx_get_source_color.patch 
Removed Files:
	lx-downscaling-fix.patch 
Log Message:
update from OLPC-2 branch

fix-potential-CPU-GP-race-in-lx_get_source_color.patch:

--- NEW FILE fix-potential-CPU-GP-race-in-lx_get_source_color.patch ---
>From a3088c6ba17d136131f76993d789305256fde2bf Mon Sep 17 00:00:00 2001
From: Bernardo Innocenti <bernie at codewiz.org>
Date: Wed, 11 Jul 2007 08:55:17 -0400
Subject: [PATCH] Fix potential CPU/GP race in lx_get_source_color()
Organization: One Laptop Per Child

---
 src/amd_lx_exa.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/amd_lx_exa.c b/src/amd_lx_exa.c
index 3f079cd..69c8fa6 100644
--- a/src/amd_lx_exa.c
+++ b/src/amd_lx_exa.c
@@ -262,6 +262,9 @@ static unsigned int lx_get_source_color(PicturePtr pSrc, int x, int y, int dstFo
   
   bits += (y * stride) + (x * (bpp >> 3));
 
+  /* GP may still be working on this surface */
+  gp_wait_until_idle();
+
   /* Read the source value */
 
   switch(bpp) {
-- 
1.5.2.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2007 19:37:39 -0000	1.9
+++ sources	9 Sep 2007 04:20:23 -0000	1.10
@@ -1 +1 @@
-330632bf2bfe0c80094dc288788367ab  xf86-video-amd-0.0-git20070625.tar.bz2
+21dbe589b49f71b189d40f6aa5e0aab9  xf86-video-amd-0.0-git20070807.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/xorg-x11-drv-amd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-amd.spec	25 Jun 2007 19:37:39 -0000	1.15
+++ xorg-x11-drv-amd.spec	9 Sep 2007 04:20:23 -0000	1.16
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070625
+%define gitdate 20070807
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   22.%{gitdate}%{?dist}
+Release:   23.%{gitdate}%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -37,7 +37,9 @@
 
 Patch0: lx-disable-compression.patch
 Patch1: amd-build-fixes.patch
-Patch2: lx-downscaling-fix.patch
+
+# HACK HACK HACK (always stalls the pipeline or something like that)
+Patch2: fix-potential-CPU-GP-race-in-lx_get_source_color.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -46,7 +48,7 @@
 %setup -q -n %{tarball}-2.7.6.5
 %patch0 -p1 -b .jx
 %patch1 -p1 -b .build-fix
-%patch2 -p1 -b .lx-downscale-fix
+%patch2 -p1 -b .fix-color-race-HACK
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -80,6 +82,25 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Aug  7 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070807
+- Fix GX RGB overlay
+
+* Wed Jul 18 2007 Dan Williams <dcbw at redhat.com> 0.0-23.20070718
+- Get current framebuffer size from kernel framebuffer driver
+
+* Thu Jul 12 2007 Dan Williams <dcbw at rehdat.com> 0.0-23.20070711
+- Temporary hack for the font color corruption problem
+
+* Wed Jul 11 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070711
+- Fix display power management and dcon bugs
+
+* Fri Jul  6 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070706
+- Fix GTK drawing with GX acceleration (laptop.org #1869)
+
+* Thu Jul  5 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070705
+- Handle the LX video palette correctly
+- Remove upstreamed LX downscaling fix patch
+
 * Wed Jun 25 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070625
 - Udpate to git snapshot
    - Fix downscaling on the LX


--- lx-downscaling-fix.patch DELETED ---