1 --- a/hw/xfree86/common/xf86xv.c
2 +++ b/hw/xfree86/common/xf86xv.c
3 @@ -234,7 +234,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86
4 XF86XVScreenPtr ScreenPriv;
7 - if (num <= 0 || noXvExtension)
8 + if (num <= 0 || noXvExtension || pScreen->isGPU)
11 if (Success != XvScreenInit(pScreen))
12 --- a/hw/xfree86/common/xf86xvmc.c
13 +++ b/hw/xfree86/common/xf86xvmc.c
14 @@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
16 XvMCAdaptorPtr pAdapt;
17 xf86XvMCScreenPtr pScreenPriv;
18 - XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
24 + if (noXvExtension || pScreen->isGPU || !XF86XvScreenKey)
27 + pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
32 if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors)))