diff options
| author | Helge Bahmann <helge.bahmann@secunet.com> | 2009-02-21 10:10:04 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-02-21 10:10:57 -0800 |
| commit | 81c652e9a666a7459bcc5217c8a5ec518b6e00da (patch) | |
| tree | f252b9d6fc39024e5dec7d76ee048f51c547f0bf | |
| parent | 0621ba12a3b694720e67a49b25ca52f0e09b3802 (diff) | |
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
| -rw-r--r-- | src/i830_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index e7ca6b04..0a8a9c6b 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -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; |