summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2018-04-02 22:39:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-03 23:53:19 +0100
commit0879ac940b683d979286f7a65ab08756b376f4f1 (patch)
tree71a14a8cbd9a74599ad7dc0ddd10c8e3bb8648d0 /meta
parent4ca75e4226eda74a5468d7cc206f5976bfe6ee49 (diff)
downloadpoky-0879ac940b683d979286f7a65ab08756b376f4f1.tar.gz
mesa: fix unitialized modifier for DRI2
This came up whith disabled DRI3 on Raspi/VC4 [1] but might be important for other drivers: It fixes an improper initialization. [1] https://lists.freedesktop.org/archives/mesa-dev/2018-March/190562.html (From OE-Core rev: bfd5d2cefd56cb60b51b2bed57cb92dcfd5756c9) Signed-off-by: Andreas Müller <schnitzeltony@gmail.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_17.3.7.bb1
2 files changed, 44 insertions, 0 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
new file mode 100644
index 0000000000..6aba7859ee
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch
@@ -0,0 +1,43 @@
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_17.3.7.bb b/meta/recipes-graphics/mesa/mesa_17.3.7.bb
index fe09a2988d..9c75d6c693 100644
--- a/meta/recipes-graphics/mesa/mesa_17.3.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.3.7.bb
@@ -9,6 +9,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
9 file://llvm-config-version.patch \ 9 file://llvm-config-version.patch \
10 file://0001-winsys-svga-drm-Include-sys-types.h.patch \ 10 file://0001-winsys-svga-drm-Include-sys-types.h.patch \
11 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ 11 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
12 file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "769137f2538562c300c4b76bcb097377" 15SRC_URI[md5sum] = "769137f2538562c300c4b76bcb097377"