rpms/xorg-x11-drv-i810/F-9 intel-2.2.1-xaa-xv.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.95, 1.96

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20239

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.2.1-xaa-xv.patch 
Log Message:
* Wed Apr 23 2008 Adam Jackson <ajax at redhat.com> 2.2.1-22
- intel-2.2.1-xaa-xv.patch: Fix Xv overlay video to work when using XAA
  and when the compositor is active. (#239125)


intel-2.2.1-xaa-xv.patch:

--- NEW FILE intel-2.2.1-xaa-xv.patch ---
>From 1d467a8038946a37844795e8860be113d43219ac Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp at keithp.com>
Date: Wed, 23  Apr  2008  18:08:38  +0000
Subject: Overlay video doesn't require that the target pixmap be in video memory.

I830PutImage was checking to make sure the target pixmap resided in video
memory, but this isn't necessary when using the overlay. Test
---
diff --git a/src/i830_video.c b/src/i830_video.c
index 1fa9d75..e109578 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2441,13 +2441,13 @@ I830PutImage(ScrnInfoPtr pScrn,
     }
 
 #ifdef I830_USE_EXA
-    if (pI830->useEXA) {
+    if (pPriv->textured && pI830->useEXA) {
 	/* Force the pixmap into framebuffer so we can draw to it. */
 	exaMoveInPixmap(pPixmap);
     }
 #endif
 
-    if (!pI830->useEXA &&
+    if (pPriv->textured && !pI830->useEXA &&
 	    (((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
 	     ((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
 	      pI830->FbMapSize))) {
--
cgit v0.7.2-37-g538c


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/xorg-x11-drv-i810.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- xorg-x11-drv-i810.spec	22 Apr 2008 21:10:15 -0000	1.95
+++ xorg-x11-drv-i810.spec	23 Apr 2008 18:11:21 -0000	1.96
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   21%{?dist}
+Release:   22%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -33,6 +33,9 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=13326
 Patch11: intel-2.2.1-disable-fbc.patch
 
+# Fix XAA overlay video when Composite is enabled
+Patch12: intel-2.2.1-xaa-xv.patch
+
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
 Patch103: intel-disable-stepping.patch
@@ -74,6 +77,7 @@
 #patch4 -p1 -b .xv-compiz
 %patch8 -p1 -b .disablettm
 %patch11 -p1 -b .fbc
+%patch12 -p1 -b .xaa-xv
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
@@ -146,6 +150,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Wed Apr 23 2008 Adam Jackson <ajax at redhat.com> 2.2.1-22
+- intel-2.2.1-xaa-xv.patch: Fix Xv overlay video to work when using XAA
+  and when the compositor is active. (#239125)
+
 * Mon Apr 21 2008 Dave Airlie <airlied at redhat.com> 2.2.1-21
 - include some updates to 2.3 rc, remove lots of patches
 - fixes EXA to work without DRI properly