xf86-video-intel: src/sna/sna_video.c

[Chris Wilson]

 src/sna/sna_video.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9df5e48c582e5c4edffdece75b5395c230a50b09
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Feb 19 10:08:29 2013 +0000

    sna/video: Only setup XvMC if we first setup Xv
    
    Under certain circumstances, XvScreenInit can indeed fail, so do not
    bother with creatin XvMC (as it triggers internal assertions if it
    cannot find our adaptor amongst Xv's).
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
index 07fa829..ecf52d2 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -569,13 +569,13 @@ void sna_video_init(struct sna *sna, ScreenPtr screen)
 	if (overlay && !prefer_overlay)
 		adaptors[num_adaptors++] = overlay;
 
-	if (num_adaptors)
-		xf86XVScreenInit(screen, adaptors, num_adaptors);
-	else
+	if (num_adaptors) {
+		Bool ok = xf86XVScreenInit(screen, adaptors, num_adaptors);
+		if (ok && textured)
+			sna_video_xvmc_setup(sna, screen, textured);
+	} else
 		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
 			   "Disabling Xv because no adaptors could be initialized.\n");
-	if (textured)
-		sna_video_xvmc_setup(sna, screen, textured);
 
 	free(adaptors);
 }