Author: arekm Date: Tue Aug 18 05:28:16 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; git fixes
---- Files affected: packages/xorg-driver-video-intel: xorg-driver-video-intel.spec (1.76 -> 1.77) , xorg-driver-video-intel-git.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xorg-driver-video-intel/xorg-driver-video-intel.spec diff -u packages/xorg-driver-video-intel/xorg-driver-video-intel.spec:1.76 packages/xorg-driver-video-intel/xorg-driver-video-intel.spec:1.77 --- packages/xorg-driver-video-intel/xorg-driver-video-intel.spec:1.76 Fri Aug 14 11:54:39 2009 +++ packages/xorg-driver-video-intel/xorg-driver-video-intel.spec Tue Aug 18 07:28:10 2009 @@ -4,11 +4,12 @@ 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 @@ -56,6 +57,7 @@ %prep %setup -q -n xf86-video-intel-%{version} +%patch0 -p1 %build %configure \ @@ -100,6 +102,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.77 2009/08/18 05:28:10 arekm +- rel 2; git fixes + Revision 1.76 2009/08/14 09:54:39 arekm - force latest xserver 1.6.3 ================================================================ Index: packages/xorg-driver-video-intel/xorg-driver-video-intel-git.patch diff -u /dev/null packages/xorg-driver-video-intel/xorg-driver-video-intel-git.patch:1.1 --- /dev/null Tue Aug 18 07:28:16 2009 +++ packages/xorg-driver-video-intel/xorg-driver-video-intel-git.patch Tue Aug 18 07:28:09 2009 @@ -0,0 +1,68 @@ +commit 376397c21eb9a7e4ea79d349af41da81c1af861f +Author: Zhenyu Wang <[email protected]> +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 <[email protected]> + +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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-intel/xorg-driver-video-intel.spec?r1=1.76&r2=1.77&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
