xf86-video-intel: 2 commits - src/i830_display.c

[Jesse Barnes]

 src/i830_display.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2aaa207db2cea03ba05c439b5074807689f2c5be
Merge: 2049ba2... 76eb8e6...
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date:   Thu Jul 31 13:10:19 2008 -0700

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
    
    Conflicts:
    
    	src/i830_display.c

diff --cc src/i830_display.c
index 2a267f1,2e1de41..e1dad03
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@@ -1477,8 -1477,6 +1477,9 @@@ i830_crtc_mode_set(xf86CrtcPtr crtc, Di
      /* Wait for the clocks to stabilize. */
      usleep(150);
  
-     i830_update_dsparb(pScrn);
++    if (!DSPARB_HWCONTROL(pI830))
++	i830_update_dsparb(pScrn);
 +
      OUTREG(htot_reg, (adjusted_mode->CrtcHDisplay - 1) |
  	((adjusted_mode->CrtcHTotal - 1) << 16));
      OUTREG(hblank_reg, (adjusted_mode->CrtcHBlankStart - 1) |
commit 2049ba211e7cdc383976c09f52c2b43acdd59481
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date:   Thu Jul 31 13:07:20 2008 -0700

    Update DSPARB while planes are still off
    
    This avoids the flickering people reported in the 2.4.0 release.

diff --git a/src/i830_display.c b/src/i830_display.c
index 6176447..2a267f1 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1477,6 +1477,8 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
     /* Wait for the clocks to stabilize. */
     usleep(150);
 
+    i830_update_dsparb(pScrn);
+
     OUTREG(htot_reg, (adjusted_mode->CrtcHDisplay - 1) |
 	((adjusted_mode->CrtcHTotal - 1) << 16));
     OUTREG(hblank_reg, (adjusted_mode->CrtcHBlankStart - 1) |
@@ -1510,8 +1512,6 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
     
     i830WaitForVblank(pScrn);
 
-    i830_update_dsparb(pScrn);
-
     /* Clear any FIFO underrun status that may have occurred normally */
     OUTREG(pipestat_reg, INREG(pipestat_reg) | FIFO_UNDERRUN);
 }