- rel 2; git fixes

Changed files:
    xorg-driver-video-intel-git.patch -> 1.1
    xorg-driver-video-intel.spec -> 1.77

diff --git a/xorg-driver-video-intel-git.patch b/xorg-driver-video-intel-git.patch
new file mode 100644 (file)
index 0000000..71bdbcc
--- /dev/null
+++ b/xorg-driver-video-intel-git.patch
@@ -0,0 +1,68 @@
+commit 376397c21eb9a7e4ea79d349af41da81c1af861f
+Author: Zhenyu Wang <zhenyuw@linux.intel.com>
+Date:   Tue Aug 18 10:01:12 2009 +0800
+
+    Fix VGA plane disabling
+    
+    Only apply on G4X with SR01 bit5 workaround for VGA plane disable, and
+    restore behavior back for other chips to make sure other modes got disabled
+    too.
+    
+    For bug #17235, #19715, #21064, #23178
+    
+    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
+
+diff --git a/src/i830_display.c b/src/i830_display.c
+index 59ededc..f83e021 100644
+--- a/src/i830_display.c
++++ b/src/i830_display.c
+@@ -1076,29 +1076,31 @@ i830_disable_vga_plane (xf86CrtcPtr crtc)
+ {
+     ScrnInfoPtr pScrn = crtc->scrn;
+     I830Ptr pI830 = I830PTR(pScrn);
+-    uint32_t vgacntrl = INREG(VGACNTRL);
+     uint8_t sr01;
+ 
+-    if (vgacntrl & VGA_DISP_DISABLE)
+-      return;
+-
+     /*
+-       Set bit 5 of SR01;
+-       Wait 30us;
+-       */
+-    OUTREG8(SRX, 1);
+-    sr01 = INREG8(SRX + 1);
+-    OUTREG8(SRX + 1, sr01 | (1 << 5));
+-    usleep(30);
+-    /* disable center mode on 965GM and G4X platform */
+-    if (IS_I965GM(pI830) || IS_G4X(pI830))
+-        vgacntrl &= ~(3 << 24);
+-
+-    vgacntrl |= VGA_DISP_DISABLE;
+-
+-    OUTREG(VGACNTRL, vgacntrl);
++     * Bug #17235: G4X machine needs following steps
++     * for disable VGA.
++     * - set bit 5 of SR01;
++     * - Wait 30us;
++     * - disable vga plane;
++     * - restore SR01;
++     */
++    if (IS_G4X(pI830)) {
++      OUTREG8(SRX, 1);
++      sr01 = INREG8(SRX + 1);
++      OUTREG8(SRX + 1, sr01 | (1 << 5));
++      usleep(30);
++    }
++
++    OUTREG(VGACNTRL, VGA_DISP_DISABLE);
+     i830WaitForVblank(pScrn);
+ 
++    /* restore SR01 */
++    if (IS_G4X(pI830)) {
++      OUTREG8(SRX, 1);
++      OUTREG8(SRX + 1, sr01);
++    }
+ }
+ 
+ static void

diff --git a/xorg-driver-video-intel.spec b/xorg-driver-video-intel.spec
index f7fb39138b4a8f8482f5f66c17ec73a701d0ed37..3d0de1b730353e351204d8ad743288a5767d6a2d 100644 (file)
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -3,11 +3,12 @@ Summary:      X.org video driver for Intel integrated graphics chipsets
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla zintegrowanych układów graficznych Intela
 Name:          xorg-driver-video-intel
 Version:       2.8.0.901
-Release:       1
+Release:       2
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
 # Source0-md5: 4b9d4b5a75e9aa2172b6499b1d30554f
+Patch0:                %{name}-git.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
 BuildRequires: autoconf >= 2.57
@@ -55,6 +56,7 @@ Obsługuje układy i810, i810-DC100, i810e, i815, 830M, 845G, 852GM,
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
+%patch0 -p1
 
 %build
 %configure \