diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-05-22 11:28:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-27 17:06:34 +0100 |
commit | 1e1e6c080345bb8bc45e769b6d3d7cc4cdd452d9 (patch) | |
tree | c350d6469d4db7f57dd75ab7a76cb48f4ebe9066 /meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch | |
parent | 2c0f37d2da3e662dd81b62b911e8135cc7e4b98f (diff) | |
download | poky-1e1e6c080345bb8bc45e769b6d3d7cc4cdd452d9.tar.gz |
mesa: Fix a case when gbm is enabled but DRIDRIVERS is not defined
This is a typical scenario with arm platforms, with meson if DRIDRIVERS
is empty then dri is disabled automatically, but gbm needs dri2 enabled
for it to have proper backend, in autotools we could use --enable-gbm
--enable-dri and get correct behaviour but with meson enabling dri2 only
works if DRIDRIVERS is not empty
This fixes mesa-gl build for rpi machines when using userland graphics
(From OE-Core rev: 0c670a0fad379c3dc2a69ac5abfeaceda98a2f9c)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch new file mode 100644 index 0000000000..52d670a296 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-Allow-enable-DRI-without-DRI-drivers.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 8e0a58c8eea7ed70071cac139655700fdfa16445 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei@gherzan.ro> | ||
3 | Date: Wed, 22 May 2019 18:32:07 +0100 | ||
4 | Subject: [PATCH] Allow enable DRI without DRI drivers | ||
5 | |||
6 | Upstream-status: Pending | ||
7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
8 | --- | ||
9 | meson.build | 2 +- | ||
10 | meson_options.txt | 6 ++++++ | ||
11 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 53d02e3..9a8578f 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -119,7 +119,7 @@ with_dri_r200 = _drivers.contains('r200') | ||
18 | with_dri_nouveau = _drivers.contains('nouveau') | ||
19 | with_dri_swrast = _drivers.contains('swrast') | ||
20 | |||
21 | -with_dri = _drivers.length() != 0 and _drivers != [''] | ||
22 | +with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != ['']) | ||
23 | |||
24 | _drivers = get_option('gallium-drivers') | ||
25 | if _drivers.contains('auto') | ||
26 | diff --git a/meson_options.txt b/meson_options.txt | ||
27 | index ccf7065..5174320 100644 | ||
28 | --- a/meson_options.txt | ||
29 | +++ b/meson_options.txt | ||
30 | @@ -34,6 +34,12 @@ option( | ||
31 | choices : ['auto', 'true', 'false'], | ||
32 | description : 'enable support for dri3' | ||
33 | ) | ||
34 | +option( | ||
35 | + 'dri', | ||
36 | + type : 'boolean', | ||
37 | + value : false, | ||
38 | + description : 'enable support for dri' | ||
39 | +) | ||
40 | option( | ||
41 | 'dri-drivers', | ||
42 | type : 'array', | ||
43 | -- | ||
44 | 2.17.1 | ||
45 | |||