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

[Zhenyu Wang]

 src/i830_display.c        |    3 +++
 src/reg_dumper/.gitignore |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 69c84f2c8204771b68f40ed64e64657237b54546
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Thu Mar 26 13:52:05 2009 +0800

    gitignore intel_lid

diff --git a/src/reg_dumper/.gitignore b/src/reg_dumper/.gitignore
index 5aac542..60a9a4f 100644
--- a/src/reg_dumper/.gitignore
+++ b/src/reg_dumper/.gitignore
@@ -4,3 +4,4 @@ intel_idle
 intel_reg_dumper
 intel_stepping
 intel_statuspage
+intel_lid
commit b5b377806422c9538fa9f846819ad253c1a50846
Author: Ma, Ling <ling.ma at intel.com>
Date:   Wed Mar 25 14:39:46 2009 +0800

    disable center mode for 965GM and G4X platform
    
    When disabling VGA mode, usually we don't need to touch VGA center mode.
    However because of hardware reason, for Cresline, Cantiga & Eaglelake platform,
    we have to disable center mode as well. The patch fixed bug- TV Out strobing regression,
    reported by Robert Lowery in intel-gfx at lists.freedesktop.org mailing list.
    
    Signed-off-by: Ma Ling <ling.ma at intel.com>

diff --git a/src/i830_display.c b/src/i830_display.c
index a44143f..dd1310f 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1113,6 +1113,9 @@ i830_disable_vga_plane (xf86CrtcPtr crtc)
     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;