rpms/xorg-x11-drv-i810/FC-6 i965-xv-hang-fix.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.43, 1.44

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7351

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	i965-xv-hang-fix.patch 
Log Message:
* Tue Nov 7 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-10
- i965-xv-hang-fix.patch: Backport Xv hang fix for G965.


i965-xv-hang-fix.patch:
 packed_yuv_wm.g4a |    2 +-
 wm_prog.h         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE i965-xv-hang-fix.patch ---
From: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date: Mon, 30 Oct 2006 06:15:12 +0000 (+0800)
Subject: Bug 8594: Fix Xv hang with G965
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=fbb376bd1a4daad4c86e349df98438989ce173f1

Bug 8594: Fix Xv hang with G965
---

--- xorg-x11-drv-i810-1.6.5/xf86-video-i810-1.6.5/src/packed_yuv_wm.g4a
+++ xorg-x11-drv-i810-1.6.5/xf86-video-i810-1.6.5/src/packed_yuv_wm.g4a
@@ -144,7 +144,7 @@ mac.sat (8) m8<1>F g15<8,8,1>F 1F { alig
     */
 mov (8) m1<1>UD g1<8,8,1>UD { align1 mask_disable };
    /* Send framebuffer write message: XXX: acc0? */
-send (16) 0 null g0<8,8,1>UW write (
+send (16) 0 acc0<1>UW g0<8,8,1>UW write (
 	0, /* binding table index 0 */
 	8, /* pixel scoreboard clear */
 	4, /* render target write */
--- xorg-x11-drv-i810-1.6.5/xf86-video-i810-1.6.5/src/wm_prog.h
+++ xorg-x11-drv-i810-1.6.5/xf86-video-i810-1.6.5/src/wm_prog.h
@@ -71,7 +71,7 @@
    { 0x00600041, 0x20007fbc, 0x008d0220, 0x40011687 },
    { 0x80600048, 0x21007fbe, 0x008d01e0, 0x3f800000 },
    { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 },
-   { 0x00800031, 0x20001d3c, 0x008d0000, 0x85a04800 },
+   { 0x00800031, 0x24001d28, 0x008d0000, 0x85a04800 },
    { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
    { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
    { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/FC-6/xorg-x11-drv-i810.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-drv-i810.spec	1 Oct 2006 21:19:05 -0000	1.43
+++ xorg-x11-drv-i810.spec	7 Nov 2006 22:20:49 -0000	1.44
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -32,6 +32,8 @@
 Patch100: i810-1.6.5-to-git-20060911.patch
 Patch101: i810-match-server-sync-ranges.patch
 
+Patch1000: i965-xv-hang-fix.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
@@ -59,12 +61,14 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
+# fc6 baseline patches
 %setup -q -c %{tarball}-%{version} -a0 -a1
 %patch0 -p0 -b .edid-pixclock
 %patch1 -p0 -b .driver-rename
 %patch2 -p1 -b .lfp-blacklist
 %patch100 -p1 -b .i810-git-20060911
 %patch101 -p1 -b .server-ranges
+%patch1000 -p1 -b .965-xv
 
 %build
 %if %{with_dri}
@@ -117,6 +121,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Nov 7 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-10
+- i965-xv-hang-fix.patch: Backport Xv hang fix for G965.
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 1.6.5-9
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21