X Strike Force X.Org X11 SVN commit: r4209 - in trunk/driver/xserver-xorg-video-i810/debian: . patches
Author: dparsons
Date: 2007-01-19 10:43:26 -0500 (Fri, 19 Jan 2007)
New Revision: 4209
Added:
trunk/driver/xserver-xorg-video-i810/debian/patches/20-i915_bios.patch
Modified:
trunk/driver/xserver-xorg-video-i810/debian/changelog
trunk/driver/xserver-xorg-video-i810/debian/patches/series
Log:
* Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty
BIOSes (where VBE initialization failed). Closes: #382120.
* Upload to unstable.
Modified: trunk/driver/xserver-xorg-video-i810/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/changelog 2007-01-15 01:05:16 UTC (rev 4208)
+++ trunk/driver/xserver-xorg-video-i810/debian/changelog 2007-01-19 15:43:26 UTC (rev 4209)
@@ -1,11 +1,16 @@
-xserver-xorg-video-i810 (2:1.7.2-4) UNRELEASED; urgency=low
+xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low
+ [ Julien Cristau ]
* Don't build-dep on libdrm-dev on hurd-i386, and don't try to install
the libI810XvMC library there, as it isn't built without drm. Thanks to
Samuel Thibault for the patch! (closes: #383918)
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 4 Jan 2007 17:48:10 +0100
+ [ Drew Parsons ]
+ * Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty
+ BIOSes (where VBE initialization failed). Closes: #382120.
+ -- Drew Parsons <dparsons@debian.org> Sat, 20 Jan 2007 02:29:30 +1100
+
xserver-xorg-video-i810 (2:1.7.2-3) unstable; urgency=low
* Build-Depends: quilt, needed to apply patches.
Added: trunk/driver/xserver-xorg-video-i810/debian/patches/20-i915_bios.patch
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/patches/20-i915_bios.patch (rev 0)
+++ trunk/driver/xserver-xorg-video-i810/debian/patches/20-i915_bios.patch 2007-01-19 15:43:26 UTC (rev 4209)
@@ -0,0 +1,20 @@
+From: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Tue, 9 Jan 2007 14:02:47 +0000 (+0000)
+Subject: Fix bug #8536, i915 BIOS fails when restarting Xserver.
+X-Git-Tag: xf86-video-i810-1.7.4 / xf86-video-intel-1.7.4
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=33c0fac6d63d9a509a24c7a5e5a46a0d6ee4dc5d
+
+Fix bug #8536, i915 BIOS fails when restarting Xserver.
+---
+
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -7087,7 +7087,7 @@ IntelEmitInvarientState(ScrnInfoPtr pScr
+ I830Ptr pI830 = I830PTR(pScrn);
+ CARD32 ctx_addr;
+
+- if (pI830->noAccel)
++ if (pI830->noAccel || !I830IsPrimary(pScrn))
+ return;
+
+ ctx_addr = pI830->ContextMem.Start;
Modified: trunk/driver/xserver-xorg-video-i810/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-i810/debian/patches/series 2007-01-15 01:05:16 UTC (rev 4208)
+++ trunk/driver/xserver-xorg-video-i810/debian/patches/series 2007-01-19 15:43:26 UTC (rev 4209)
@@ -1,2 +1,3 @@
10-overlay_fix_lockup.patch
11-xv_lockup.patch
+20-i915_bios.patch
Reply to: