xf86-video-intel: src/i830_driver.c

[Dave Airlie]

 src/i830_driver.c |    7 +++++++
 1 files changed, 7 insertions(+)

New commits:
diff-tree c7bb34e83d7c459d932d01070cfeffbbf6c703ac (from cae0ae237b79fa7d3a82dfc8d3fb595ccb6c63e1)
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed May 2 14:25:39 2007 +1000

    disable all outputs on EnterVT
    
    This disables all outputs on EnterVT as the SDVO output can confuse
    the VGA output if the BIOS has enabled it on the same pipe but X
    isn't going to use the SDVO.
    
    Worked out on irc with keithp

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4990b8f..ad88f56 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2870,6 +2870,8 @@ I830EnterVT(int scrnIndex, int flags)
 {
    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
    I830Ptr  pI830 = I830PTR(pScrn);
+   xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
+   int o;
 
    DPRINTF(PFX, "Enter VT\n");
 
@@ -2900,6 +2902,11 @@ I830EnterVT(int scrnIndex, int flags)
    memset(pI830->FbBase + pScrn->fbOffset, 0,
 	  pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
 
+   for (o = 0; o < config->num_output; o++) {
+   	xf86OutputPtr  output = config->output[o];
+	output->funcs->dpms(output, DPMSModeOff);
+   }
+
    if (!xf86SetDesiredModes (pScrn))
       return FALSE;