Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Disable XVideo using the TexturedAdapter if the GPU is wedged 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-06-27 15:26:49 +01:00
parent 44cd6ebf43
commit 7446b39f04
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sna/sna_dri.c
View File

@ -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;
}

6
src/sna/sna_video_textured.c
View File

@ -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));