From d256f963130d0db222829096e528a2dd4dbcb41c Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Wed, 17 Dec 2008 13:56:34 +0800 Subject: [PATCH] Disable VGA once in EnterVT Instead of disable VGA everytime in crtc dpms, this trys to do once before mode setting. --- src/i830_display.c | 4 ---- src/i830_driver.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i830_display.c b/src/i830_display.c index 2e5d55a..979323d 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -902,10 +902,6 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode) usleep(150); } - /* Disable the VGA plane that we never use. */ - OUTREG(VGACNTRL, VGA_DISP_DISABLE); - i830WaitForVblank(pScrn); - break; } diff --git a/src/i830_driver.c b/src/i830_driver.c index d3b539a..0060f9d 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3683,6 +3683,10 @@ I830EnterVT(int scrnIndex, int flags) pScrn->virtualY * pScrn->displayWidth * pI830->cpp); } + /* Disable the VGA plane that we never use. */ + OUTREG(VGACNTRL, VGA_DISP_DISABLE); + i830WaitForVblank(pScrn); + if (!xf86SetDesiredModes (pScrn)) return FALSE; -- 1.5.6.5