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 <zhenyuw@linux.intel.com>
This commit is contained in:
parent
50392ac823
commit
7e79fc8aa9
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
Loading…
Reference in New Issue