summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-05-02 09:33:52 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:05 +0100
commit5f699e314d65f5a5bee473baee9d17a4fa60fe60 (patch)
tree30455c1093acff3895874ad0f2b19f226c4c7b92 /meta
parente6f9ef2aa9fe4152d265977ac480d9b70f9e58a9 (diff)
downloadpoky-5f699e314d65f5a5bee473baee9d17a4fa60fe60.tar.gz
mesa: Upgrade 17.3.8 -> 18.0.2
This includes changes from Mesa 18.0.0 and 18.0.2 releases. Mesa 18.0.0 is a new development release and 18.0.1 and 18.0.2 are bug-fix releases. You can find release notes here: - https://mesa3d.org/relnotes/18.0.0.html - https://mesa3d.org/relnotes/18.0.1.html - https://mesa3d.org/relnotes/18.0.2.html Remove patch 0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch that was applied on upstream. (From OE-Core rev: c16bc7c9b1526ff4b9496af00ada08aa4109c0ef) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch43
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa_18.0.2.bb (renamed from meta/recipes-graphics/mesa/mesa_17.3.8.bb)5
3 files changed, 2 insertions, 46 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch b/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch
deleted file mode 100644
index 6aba7859ee..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 4cbecb61682a0ee426faaa03d824fc8fd7aef826 Mon Sep 17 00:00:00 2001
2From: Daniel Stone <daniels@collabora.com>
3Date: Mon, 2 Apr 2018 13:20:34 +0100
4Subject: [PATCH] st/dri: Initialise modifier to INVALID for DRI2
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9When allocating a buffer for DRI2, set the modifier to INVALID to inform
10the backend that we have no supplied modifiers and it should do its own
11thing. The missed initialisation forced linear, even if the
12implementation had made other decisions.
13
14This resulted in VC4 DRI2 clients failing with:
15 Modifier 0x0 vs. tiling (0x700000000000001) mismatch
16
17Signed-off-by: Daniel Stone <daniels@collabora.com>
18Reported-by: Andreas Müller <schnitzeltony@gmail.com>
19Reviewed-by: Eric Anholt <eric@anholt.net>
20Fixes: 3f8513172ff6 ("gallium/winsys/drm: introduce modifier field to winsys_handle")
21
22Upstream-Status: Backport [1]
23
24[1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=4cbecb61682a0ee426faaa03d824fc8fd7aef826
25---
26 src/gallium/state_trackers/dri/dri2.c | 1 +
27 1 file changed, 1 insertion(+)
28
29diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
30index 31d17d46c2..58a6757f03 100644
31--- a/src/gallium/state_trackers/dri/dri2.c
32+++ b/src/gallium/state_trackers/dri/dri2.c
33@@ -806,6 +806,7 @@ dri2_allocate_textures(struct dri_context *ctx,
34 whandle.handle = buf->name;
35 whandle.stride = buf->pitch;
36 whandle.offset = 0;
37+ whandle.modifier = DRM_FORMAT_MOD_INVALID;
38 if (screen->can_share_buffer)
39 whandle.type = DRM_API_HANDLE_TYPE_SHARED;
40 else
41--
422.14.3
43
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb b/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb
index 73267eb4f0..73267eb4f0 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa_17.3.8.bb b/meta/recipes-graphics/mesa/mesa_18.0.2.bb
index 2d3fd3ca38..aaac1e58e1 100644
--- a/meta/recipes-graphics/mesa/mesa_17.3.8.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.0.2.bb
@@ -8,11 +8,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
8 file://llvm-config-version.patch \ 8 file://llvm-config-version.patch \
9 file://0001-winsys-svga-drm-Include-sys-types.h.patch \ 9 file://0001-winsys-svga-drm-Include-sys-types.h.patch \
10 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ 10 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
11 file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \
12 " 11 "
13 12
14SRC_URI[md5sum] = "203d1a79156ab6926f2d253b377e9d9d" 13SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e"
15SRC_URI[sha256sum] = "8f9d9bf281c48e4a8f5228816577263b4c655248dc7666e75034ab422951a6b1" 14SRC_URI[sha256sum] = "98fa159768482dc568b9f8bf0f36c7acb823fa47428ffd650b40784f16b9e7b3"
16 15
17#because we cannot rely on the fact that all apps will use pkgconfig, 16#because we cannot rely on the fact that all apps will use pkgconfig,
18#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 17#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER