rpms/xorg-x11-drv-i810/devel intel-2.1.1-fix-vt-switch.patch, NONE, 1.1 intel-2.1.1-fix-xv-reset.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.64, 1.65

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.1.1-fix-vt-switch.patch intel-2.1.1-fix-xv-reset.patch 
Log Message:
* Mon Oct 15 2007 Dave Airlie <airlied at redhat.com> 2.1.1-5
- intel-2.1.1-fix-vt-switch.patch - Only restore paletter regs on enabled pipes
- intel-2.1.1-fix-xv-reset.patch - Reset XV after mode switch


intel-2.1.1-fix-vt-switch.patch:

--- NEW FILE intel-2.1.1-fix-vt-switch.patch ---
diff -up xf86-video-intel-2.1.1/src/i830_driver.c.da xf86-video-intel-2.1.1/src/i830_driver.c
--- xf86-video-intel-2.1.1/src/i830_driver.c.da	2007-10-15 21:32:17.000000000 +1000
+++ xf86-video-intel-2.1.1/src/i830_driver.c	2007-10-15 21:33:55.000000000 +1000
@@ -1956,11 +1956,13 @@ RestoreHWState(ScrnInfoPtr pScrn)
    OUTREG(VCLK_DIVISOR_VGA1, pI830->saveVCLK_DIVISOR_VGA1);
    OUTREG(VCLK_POST_DIV, pI830->saveVCLK_POST_DIV);
 
-   for(i = 0; i < 256; i++) {
-      OUTREG(PALETTE_A + (i << 2), pI830->savePaletteA[i]);
+   if ((INREG(PIPEACONF) & PIPEACONF_ENABLE)) {
+      for(i = 0; i < 256; i++) {
+         OUTREG(PALETTE_A + (i << 2), pI830->savePaletteA[i]);
+      }
    }
    
-   if(xf86_config->num_crtc == 2) {
+   if(xf86_config->num_crtc == 2 && (INREG(PIPEBCONF) & PIPEBCONF_ENABLE)) {
       for(i= 0; i < 256; i++) {
          OUTREG(PALETTE_B + (i << 2), pI830->savePaletteB[i]);
       }

intel-2.1.1-fix-xv-reset.patch:

--- NEW FILE intel-2.1.1-fix-xv-reset.patch ---
diff -up xf86-video-intel-2.1.1/src/i830_video.c.da xf86-video-intel-2.1.1/src/i830_video.c
--- xf86-video-intel-2.1.1/src/i830_video.c.da	2007-10-15 21:30:57.000000000 +1000
+++ xf86-video-intel-2.1.1/src/i830_video.c	2007-10-15 21:31:21.000000000 +1000
@@ -2921,6 +2921,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, B
 	 */
 	I830StopVideo(pScrn, pPriv, TRUE);
 	pPriv->overlayOK = FALSE;
+	pPriv->current_crtc = NULL;
 	pPriv->oneLineMode = FALSE;
     }
 }


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xorg-x11-drv-i810.spec	5 Oct 2007 01:25:16 -0000	1.64
+++ xorg-x11-drv-i810.spec	15 Oct 2007 11:57:25 -0000	1.65
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.1.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,8 @@
 # new school intel driver patches
 Patch0: intel-2.1.1-fix-texoffset-start.patch
 Patch1: intel-2.1.1-quirk-update.patch
+Patch2: intel-2.1.1-fix-vt-switch.patch
+Patch3: intel-2.1.1-fix-xv-reset.patch
 
 # legacy i810 driver patches
 Patch100: i810-1.6.5-to-git-20060911.patch
@@ -65,6 +67,8 @@
 
 %patch0 -p1 -b .texoffsetstart
 %patch1 -p1 -b .quirk-update
+%patch2 -p1 -b .vtswitch
+%patch3 -p1 -b .xvfix
 
 %build
 OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri"
@@ -107,6 +111,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Oct 15 2007 Dave Airlie <airlied at redhat.com> 2.1.1-5
+- intel-2.1.1-fix-vt-switch.patch - Only restore paletter regs on enabled pipes
+- intel-2.1.1-fix-xv-reset.patch - Reset XV after mode switch
+
 * Fri Oct 05 2007 Dave Airlie <airlied at redhat.com> 2.1.1-4
 - intel-2.1.1-quirk-update.patch - update quirks from master