Attachment 12307 Details for Bug 12356 – Fix for XV crash, as discussed with Keith P on the Xorg mailing list

[patch] Fix for XV crash, as discussed with Keith P on the Xorg mailing list

0001-Fix-crash-in-XV-overlay-video-after-a-mode-switch.patch (text/plain), 1.07 KB, created by Peter Clifton on 2007-11-01 17:25:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Clifton

Created: 2007-11-01 17:25:36 UTC

Size: 1.07 KB

patch

obsolete

>From 3acc2648b5ec54ff299341d46033f8534fb6ee4b Mon Sep 17 00:00:00 2001
>From: Peter Clifton <pcjc2@cam.ac.uk>
>Date: Fri, 2 Nov 2007 00:24:45 +0000
>Subject: [PATCH] Fix crash in XV overlay video after a mode switch
>
>---
> src/i830_video.c |    7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/src/i830_video.c b/src/i830_video.c
>index 255444b..338bc08 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;
>     }
>-- 
>1.5.2.5
>

Actions: View | Splinter Review

Attachments on bug 12356: 11470 | 11471 | 11479 | 11481 | 11483 | 11484 | 11485 | 11526 | 11735 | 12280 | 12281 | 12307 | 12416

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.