xserver-xorg-video-nv: Changes to 'upstream-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 src/nv_dac.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ec78618d685759a39d386e9929661037b167fe68
Author: Aaron Plattner <aplattner@nvidia.com>
Date:   Tue Jul 10 11:54:33 2007 -0700

    Bug #4686: Fix a minor GeForceFX + flatpanel + video overlay corruption issue.
    
    This change was originally in XFree86 CVS, nv_dac.c version 1.36 but got
    reverted accidentally.

diff --git a/src/nv_dac.c b/src/nv_dac.c
index e1f0740..7e8340d 100644
--- a/src/nv_dac.c
+++ b/src/nv_dac.c
@@ -118,7 +118,9 @@ NVDACInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
        vertBlankStart = vertStart;
        horizStart = horizTotal - 5;
        horizEnd = horizTotal - 2;   
-       horizBlankEnd = horizTotal + 4;    
+       horizBlankEnd = horizTotal + 4;
+       if(pNv->Architecture == NV_ARCH_30)
+           horizTotal += 2;
     }
 
     pVga->CRTC[0x0]  = Set8Bits(horizTotal);