Move disable_render_standby to EnterVT instead of startup.

Otherwise, with a pre-2.6.28 older kernel the disable would be lost at
resume time and cause hangs.

Bug #20214
This commit is contained in:
Helge Bahmann 2009-02-21 10:10:04 -08:00 committed by Eric Anholt
parent 0621ba12a3
commit 81c652e9a6
1 changed files with 3 additions and 3 deletions

View File

@ -3304,9 +3304,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
if (!pI830->use_drm_mode)
i830_disable_render_standby(pScrn);
DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
if (pI830->accel <= ACCEL_XAA) {
@ -3638,6 +3635,9 @@ I830EnterVT(int scrnIndex, int flags)
pI830->leaving = FALSE;
if (!pI830->use_drm_mode)
i830_disable_render_standby(pScrn);
#ifdef XF86DRI
if (pI830->memory_manager && !pI830->use_drm_mode) {
int ret;