xf86-video-intel: src/sna/sna_dri.c src/sna/sna_video_textured.c

[Chris Wilson]

 src/sna/sna_dri.c            |    2 +-
 src/sna/sna_video_textured.c |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7446b39f04306ae2ffccdfe8dd6c8bda64a27043
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 27 15:26:49 2011 +0100

    sna: Disable XVideo using the TexturedAdapter if the GPU is wedged
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index a553549..b75c46e 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1490,7 +1490,7 @@ Bool sna_dri_open(struct sna *sna, ScreenPtr screen)
 
 	if (sna->kgem.wedged) {
 		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
-			   "cannot enable DRI2 whilst forcing software fallbacks\n");
+			   "cannot enable DRI2 whilst the GPU is wedged\n");
 		return FALSE;
 	}
 
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index a10c676..46b95ee 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -368,6 +368,12 @@ XF86VideoAdaptorPtr sna_video_textured_setup(struct sna *sna,
 		return NULL;
 	}
 
+	if (sna->kgem.wedged) {
+		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
+			   "cannot enable XVideo whilst the GPU is wedged\n");
+		return FALSE;
+	}
+
 	adaptor = calloc(1, sizeof(XF86VideoAdaptorRec));
 	video = calloc(nports, sizeof(struct sna_video));
 	devUnions = calloc(nports, sizeof(DevUnion));