diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-27 15:26:49 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-27 15:26:49 +0100 |
| commit | 7446b39f04306ae2ffccdfe8dd6c8bda64a27043 (patch) | |
| tree | 31e137c9ece2942d9e7c0f2c6ccc35d65c1b78aa | |
| parent | 44cd6ebf43aa5b7f23c03629a11cdf83b6e96e3a (diff) | |
sna: Disable XVideo using the TexturedAdapter if the GPU is wedged
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_dri.c | 2 | ||||
| -rw-r--r-- | src/sna/sna_video_textured.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c index a5535496..b75c46ed 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 a10c6769..46b95ee8 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)); |