xf86-video-intel: src/i830_video.c
Jesse Barnes
jbarnes at kemper.freedesktop.org
Thu Nov 8 16:52:44 PST 2007
src/i830_video.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 43a59ab26b09fcc24de1ed7bd770bb622f899ceb
Author: Jesse Barnes <jbarnes at hobbes.virtuousgeek.org>
Date: Thu Nov 8 16:52:41 2007 -0800
Clear current video crtc on DPMS off
When calling the video DPMS off function, make sure we zero out the current
crtc so that it will be properly re-set up next time video is turned on.
Fix from Peter Clifton with changes by Keith Packard.
diff --git a/src/i830_video.c b/src/i830_video.c
index 73ae771..5325bbd 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2832,15 +2832,14 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on)
if (crtc != pPriv->current_crtc)
return;
- /* Check if it's the crtc the overlay is on */
- if (on) {
- i830_overlay_switch_to_crtc (pScrn, crtc);
- } else {
+ /* Check if it's the crtc the overlay is off */
+ if (!on) {
/* We stop the video when mode switching, so we don't lock up
* the engine. The overlayOK will determine whether we can re-enable
* with the current video on completion of the mode switch.
*/
I830StopVideo(pScrn, pPriv, TRUE);
+ pPriv->current_crtc = NULL;
pPriv->overlayOK = FALSE;
pPriv->oneLineMode = FALSE;
}
More information about the xorg-commit
mailing list