X Strike Force X.Org X11 SVN commit: r4126 - in trunk/driver/xserver-xorg-video-i810/debian: . patches
Author: dparsons
Date: 2006-12-05 19:54:53 -0500 (Tue, 05 Dec 2006)
New Revision: 4126
Added:
trunk/driver/xserver-xorg-video-i810/debian/patches/
trunk/driver/xserver-xorg-video-i810/debian/patches/10-overlay_fix_lockup.patch
trunk/driver/xserver-xorg-video-i810/debian/patches/11-xv_lockup.patch
trunk/driver/xserver-xorg-video-i810/debian/patches/series
Modified:
trunk/driver/xserver-xorg-video-i810/debian/changelog
trunk/driver/xserver-xorg-video-i810/debian/rules
Log:
Lockup fixes:
* Apply upstream patch 1-overlay_fix_lockup.patch (git commit
e065324661ad08b3b359136f48090232f6138959, upstream bug #5774).
Should remove remaining lockup problems in I830WaitLpRing().
Closes: #272294.
* While we're at it, apply upstream patch 11-xv_lockup.patch (git
commit fbb376bd1a4daad4c86e349df98438989ce173f1, upstream bug
#8594), fixing lockups related to Xv. We'll have no lockup bugs in
etch, dammit! Closes: #397485.
* get these patches into unstable and thence etch.
Modified: trunk/driver/xserver-xorg-video-i810/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/changelog 2006-12-05 00:45:42 UTC (rev 4125)
+++ trunk/driver/xserver-xorg-video-i810/debian/changelog 2006-12-06 00:54:53 UTC (rev 4126)
@@ -1,12 +1,23 @@
-xserver-xorg-video-i810 (2:1.7.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-i810 (2:1.7.2-2) unstable; urgency=low
+ [ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
the user's config and log files.
* Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
versions don't have the bug script.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:30:41 +0100
+ [ Drew Parsons ]
+ * Apply upstream patch 1-overlay_fix_lockup.patch (git commit
+ e065324661ad08b3b359136f48090232f6138959, upstream bug #5774).
+ Should remove remaining lockup problems in I830WaitLpRing().
+ Closes: #272294.
+ * While we're at it, apply upstream patch 11-xv_lockup.patch (git
+ commit fbb376bd1a4daad4c86e349df98438989ce173f1, upstream bug
+ #8594), fixing lockups related to Xv. We'll have no lockup bugs
+ in etch, dammit! Closes: #397485.
+ -- Drew Parsons <dparsons@debian.org> Wed, 6 Dec 2006 11:50:10 +1100
+
xserver-xorg-video-i810 (2:1.7.2-1) unstable; urgency=low
* New upstream version
Added: trunk/driver/xserver-xorg-video-i810/debian/patches/10-overlay_fix_lockup.patch
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/patches/10-overlay_fix_lockup.patch (rev 0)
+++ trunk/driver/xserver-xorg-video-i810/debian/patches/10-overlay_fix_lockup.patch 2006-12-06 00:54:53 UTC (rev 4126)
@@ -0,0 +1,63 @@
+From: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Wed, 22 Nov 2006 16:49:36 +0000 (+0000)
+Subject: update port attributes immediately when overlay is on.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=e065324661ad08b3b359136f48090232f6138959
+
+update port attributes immediately when overlay is on.
+---
+
+--- a/src/i830_video.c
++++ b/src/i830_video.c
+@@ -934,14 +934,16 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+ pPriv->brightness = value;
+ overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
+ ErrorF("BRIGHTNESS\n");
+- OVERLAY_UPDATE;
++ if (*pI830->overlayOn)
++ OVERLAY_UPDATE;
+ } else if (attribute == xvContrast) {
+ if ((value < 0) || (value > 255))
+ return BadValue;
+ pPriv->contrast = value;
+ overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
+ ErrorF("CONTRAST\n");
+- OVERLAY_UPDATE;
++ if (*pI830->overlayOn)
++ OVERLAY_UPDATE;
+ } else if (pI830->Clone && attribute == xvPipe) {
+ if ((value < 0) || (value > 1))
+ return BadValue;
+@@ -955,7 +957,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+ else
+ overlay->OCONFIG |= OVERLAY_PIPE_B;
+ ErrorF("PIPE CHANGE\n");
+- OVERLAY_UPDATE;
++ if (*pI830->overlayOn)
++ OVERLAY_UPDATE;
+ } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
+ pPriv->gamma0 = value;
+ } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
+@@ -982,7 +985,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+ break;
+ }
+ ErrorF("COLORKEY\n");
+- OVERLAY_UPDATE;
++ if (*pI830->overlayOn)
++ OVERLAY_UPDATE;
+ REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
+ } else if(attribute == xvDoubleBuffer) {
+ if ((value < 0) || (value > 1))
+@@ -1000,13 +1004,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
+ attribute == xvGamma3 ||
+ attribute == xvGamma4 ||
+ attribute == xvGamma5) && (IS_I9XX(pI830))) {
+- CARD32 r = overlay->OCMD & OVERLAY_ENABLE;
+ ErrorF("GAMMA\n");
+- overlay->OCMD &= ~OVERLAY_ENABLE;
+- OVERLAY_UPDATE;
+ I830UpdateGamma(pScrn);
+- overlay->OCMD |= r;
+- OVERLAY_UPDATE;
+ }
+
+ return Success;
Added: trunk/driver/xserver-xorg-video-i810/debian/patches/11-xv_lockup.patch
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/patches/11-xv_lockup.patch (rev 0)
+++ trunk/driver/xserver-xorg-video-i810/debian/patches/11-xv_lockup.patch 2006-12-06 00:54:53 UTC (rev 4126)
@@ -0,0 +1,30 @@
+From: Wang Zhenyu <zhenyu.z.wang@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
+---
+
+--- a/src/packed_yuv_wm.g4a
++++ b/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 */
+--- a/src/wm_prog.h
++++ b/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 },
Added: trunk/driver/xserver-xorg-video-i810/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/patches/series (rev 0)
+++ trunk/driver/xserver-xorg-video-i810/debian/patches/series 2006-12-06 00:54:53 UTC (rev 4126)
@@ -0,0 +1,2 @@
+10-overlay_fix_lockup.patch
+11-xv_lockup.patch
Modified: trunk/driver/xserver-xorg-video-i810/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/rules 2006-12-05 00:45:42 UTC (rev 4125)
+++ trunk/driver/xserver-xorg-video-i810/debian/rules 2006-12-06 00:54:53 UTC (rev 4126)
@@ -31,7 +31,7 @@
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
Reply to: