ODROID-U3 xorg-server debian package fork :
[deb_xorg-server.git] / debian / patches / xfree86-no-xv-for-gpuscreens.patch
CommitLineData
7217e0ca
ML
1--- a/hw/xfree86/common/xf86xv.c
2+++ b/hw/xfree86/common/xf86xv.c
4db25562 3@@ -234,7 +234,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86
7217e0ca
ML
4 XF86XVScreenPtr ScreenPriv;
5 XvScreenPtr pxvs;
6
7- if (num <= 0 || noXvExtension)
8+ if (num <= 0 || noXvExtension || pScreen->isGPU)
9 return FALSE;
10
11 if (Success != XvScreenInit(pScreen))
7217e0ca
ML
12--- a/hw/xfree86/common/xf86xvmc.c
13+++ b/hw/xfree86/common/xf86xvmc.c
14@@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
15 {
16 XvMCAdaptorPtr pAdapt;
17 xf86XvMCScreenPtr pScreenPriv;
18- XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
19- XF86XvScreenKey);
20+ XvScreenPtr pxvs;
21 int i, j;
22
23- if (noXvExtension)
24+ if (noXvExtension || pScreen->isGPU || !XF86XvScreenKey)
25+ return FALSE;
26+
27+ pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
28+ XF86XvScreenKey);
29+ if (!pxvs)
30 return FALSE;
31
32 if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors)))