From c7bb34e83d7c459d932d01070cfeffbbf6c703ac Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 2 May 2007 14:25:39 +1000 Subject: [PATCH] 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 --- src/i830_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/i830_driver.c b/src/i830_driver.c index 4990b8f6..ad88f567 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;