diff --git a/src/i830_driver.c b/src/i830_driver.c index b0bb9da..f6712ca 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3575,24 +3575,24 @@ I830CheckDevicesTimer(OsTimerPtr timer, CARD32 now, pointer arg) /* Check for a hotkey press report from the BIOS. */ gr18 = pI830->readControl(pI830, GRX, 0x18); if ((gr18 & (HOTKEY_TOGGLE | HOTKEY_SWITCH)) != 0) { - /* The user has pressed the hotkey requesting a toggle or switch. - * Re-probe our connected displays and turn on whatever we find. - * - * In the future, we want the hotkey to dump down to a user app which - * implements a sensible policy using RandR-1.2. For now, all we get - * is this. - */ - - xf86ProbeOutputModes (pScrn, 0, 0); - xf86SetScrnInfoModes (pScrn); - xf86DiDGAReInit (pScrn->pScreen); - xf86SwitchMode(pScrn->pScreen, pScrn->currentMode); - /* Clear the BIOS's hotkey press flags */ gr18 &= ~(HOTKEY_TOGGLE | HOTKEY_SWITCH); pI830->writeControl(pI830, GRX, 0x18, gr18); } + /* The user has pressed the hotkey requesting a toggle or switch. + * Re-probe our connected displays and turn on whatever we find. + * + * In the future, we want the hotkey to dump down to a user app which + * implements a sensible policy using RandR-1.2. For now, all we get + * is this. + */ + + xf86ProbeOutputModes (pScrn, 0, 0); + xf86SetScrnInfoModes (pScrn); + xf86DiDGAReInit (pScrn->pScreen); + xf86SwitchMode(pScrn->pScreen, pScrn->currentMode); + return 1000; }