From 7e79fc8aa93df4df37c25cf37ee0ec6c7caca1d9 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Tue, 30 Jun 2009 15:40:34 +0800 Subject: Fix 945GM VT switch in UMS Bug #19578. We should set private intel_crtc state according to current, as fail to do so pipe A needs active won't be taken care of. Also make sure pipe swap operation always set during VT switch. Signed-off-by: Zhenyu Wang --- src/i830_display.c | 1 + src/i830_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/i830_display.c b/src/i830_display.c index a7eafb97..26874c5c 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1257,6 +1257,7 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode) if ((pipe == 0) && (pI830->quirk_flag & QUIRK_PIPEA_FORCE)) disable_pipe = FALSE; i830_crtc_disable(crtc, disable_pipe); + intel_crtc->enabled = FALSE; break; } diff --git a/src/i830_driver.c b/src/i830_driver.c index 45a8aee6..c125a73e 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2786,9 +2786,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } i830_init_bufmgr(pScrn); - if (!pI830->use_drm_mode) - I830SwapPipes(pScrn); - pScrn->fbOffset = pI830->front_buffer->offset; if (!pI830->use_drm_mode) { @@ -3077,6 +3074,9 @@ I830EnterVT(int scrnIndex, int flags) /* Get the hardware into a known state if needed */ if (!pI830->use_drm_mode) { + + I830SwapPipes(pScrn); + /* Disable outputs */ for (i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; -- cgit v1.2.3