summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-09-26 22:48:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-10 16:44:31 +0100
commitcc2add24f487b271c4e8e4878ac65a9c6e3a405e (patch)
tree6109e3963e305d22b7fbe424ba496ed026cabb2d
parent6334380d17d9d38130209d7e3f3a4dd504f08e10 (diff)
downloadpoky-cc2add24f487b271c4e8e4878ac65a9c6e3a405e.tar.gz
xserver-xorg: report DRI3 and Present modules as present
The DRI3 and Present modules are built-in but some drivers (such as xf86-video-intel) want to query their presence. Backport a patch from upstream to stop this causing an error. [ YOCTO #6583 ] (From OE-Core rev: d7bb1d8b1a7cd11895037b7984b9aa916efa9733) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch66
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb1
2 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
new file mode 100644
index 0000000000..13f3caf768
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
@@ -0,0 +1,66 @@
1[ YOCTO #6583 ]
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001
7From: Chris Wilson <chris@chris-wilson.co.uk>
8Date: Wed, 28 May 2014 08:13:59 +0100
9Subject: xfree86: Report DRI3 as a built-in module
10
11This is so that drivers can do a runtime check that DRI3 is available,
12similar to existing runtime checks performed by the drivers for DRI and
13DRI2.
14
15v2: Only add DRI3 to the list if the module was actually built into the
16server (Mark Kettenis).
17
18Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
19Cc: Mark Kettenis <mark.kettenis@xs4all.nl>
20Signed-off-by: Keith Packard <keithp@keithp.com>
21
22diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
23index 092bf57..f92ad8d 100644
24--- a/hw/xfree86/loader/loadmod.c
25+++ b/hw/xfree86/loader/loadmod.c
26@@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = {
27 "extmod",
28 "dri",
29 "dri2",
30+#if DRI3
31+ "dri3",
32+#endif
33 NULL
34 };
35
36--
37cgit v0.10.2
38
39
40From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001
41From: Chris Wilson <chris@chris-wilson.co.uk>
42Date: Wed, 28 May 2014 08:14:00 +0100
43Subject: xfree86: Report Present as a built-in module
44
45This is so that drivers can do a runtime check that Present is available,
46similar to existing runtime checks performed by the drivers for DRI.
47
48Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
49Signed-off-by: Keith Packard <keithp@keithp.com>
50
51diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
52index f92ad8d..e1f649a 100644
53--- a/hw/xfree86/loader/loadmod.c
54+++ b/hw/xfree86/loader/loadmod.c
55@@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = {
56 #if DRI3
57 "dri3",
58 #endif
59+#if PRESENT
60+ "present",
61+#endif
62 NULL
63 };
64
65--
66cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb
index e952e6096a..3bba3ce0bf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://crosscompile.patch \
6 file://mips64-compiler.patch \ 6 file://mips64-compiler.patch \
7 file://xorg-CVE-2013-6424.patch \ 7 file://xorg-CVE-2013-6424.patch \
8 file://xshmfence-option.patch \ 8 file://xshmfence-option.patch \
9 file://present-module.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" 12SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227"