diff options
Diffstat (limited to 'meta-amd-bsp/recipes-graphics/mesa/files')
4 files changed, 165 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-amd-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch new file mode 100644 index 00000000..6b85538f --- /dev/null +++ b/meta-amd-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -0,0 +1,40 @@ +From d6630c48a1aed64ff1068524b3aae76fff7b3447 Mon Sep 17 00:00:00 2001 +From: "Arsalan H. Awan" <Arsalan_Awan@mentor.com> +Date: Mon, 19 Aug 2019 17:29:18 +0500 +Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations + +Make sure that we are also looking for our host_os combinations like +linux-musl etc. when assuming support for DRM/KMS. + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com> +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 13b561f99de..78d0ea47790 100644 +--- a/meson.build ++++ b/meson.build +@@ -106,7 +106,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 + # Only build shared_glapi if at least one OpenGL API is enabled + with_shared_glapi = get_option('shared-glapi') and with_any_opengl + +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system()) ++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') + + dri_drivers = get_option('dri-drivers') + if dri_drivers.contains('auto') +@@ -835,7 +835,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', + endif + + # TODO: this is very incomplete +-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) ++if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') + pre_args += '-D_GNU_SOURCE' + endif + +-- +2.11.1 + diff --git a/meta-amd-bsp/recipes-graphics/mesa/files/0001-radeonsi-disabling-the-displayable-DCC-on-Raven-Ridg.patch b/meta-amd-bsp/recipes-graphics/mesa/files/0001-radeonsi-disabling-the-displayable-DCC-on-Raven-Ridg.patch new file mode 100644 index 00000000..67f140e5 --- /dev/null +++ b/meta-amd-bsp/recipes-graphics/mesa/files/0001-radeonsi-disabling-the-displayable-DCC-on-Raven-Ridg.patch @@ -0,0 +1,28 @@ +From 19e44acaf9b1e2609e32ee46fec19dc278188918 Mon Sep 17 00:00:00 2001 +From: Pavan Kumar Ramayanam <pavan.ramayanam@amd.com> +Date: Mon, 19 Aug 2019 14:31:42 +0530 +Subject: [PATCH] radeonsi: disabling the displayable DCC on Raven Ridge1 due + to Vaapi-vaapi fullscreen playback causing hard hang Signed-off-by: + Pavan Kumar Ramayanam <pavan.ramayanam@amd.com> + +--- + src/amd/common/ac_gpu_info.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c +index a501d840b25..9fd792bb4b6 100644 +--- a/src/amd/common/ac_gpu_info.c ++++ b/src/amd/common/ac_gpu_info.c +@@ -475,8 +475,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, + info->ib_start_alignment = ib_align; + + if (info->drm_minor >= 31 && +- (info->family == CHIP_RAVEN || +- info->family == CHIP_RAVEN2)) { ++ (info->family == CHIP_RAVEN2)) { + if (info->num_render_backends == 1) + info->use_display_dcc_unaligned = true; + else +-- +2.17.1 + diff --git a/meta-amd-bsp/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch b/meta-amd-bsp/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch new file mode 100644 index 00000000..9433e450 --- /dev/null +++ b/meta-amd-bsp/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch @@ -0,0 +1,51 @@ +From d75beb97e470d1a9bd217004a4b0663da24a58bc Mon Sep 17 00:00:00 2001 +From: "Arsalan H. Awan" <Arsalan_Awan@mentor.com> +Date: Mon, 19 Aug 2019 17:32:48 +0500 +Subject: [PATCH 2/3] meson.build: make TLS GLX optional again + +This was optional with autotools, and needs to be disabled +when using musl C library, for instance. + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com> +--- + meson.build | 4 +++- + meson_options.txt | 6 ++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 78d0ea47790..bb6e3083c20 100644 +--- a/meson.build ++++ b/meson.build +@@ -365,7 +365,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat + endif + endif + +-pre_args += '-DGLX_USE_TLS' ++if get_option('glx-tls') ++ pre_args += '-DGLX_USE_TLS' ++endif + if with_glx != 'disabled' + if not (with_platform_x11 and with_any_opengl) + error('Cannot build GLX support without X11 platform support and at least one OpenGL API') +diff --git a/meson_options.txt b/meson_options.txt +index 5cbb85658a2..c0ce8d8c8bf 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -334,6 +334,12 @@ option( + description : 'Enable direct rendering in GLX and EGL for DRI', + ) + option( ++ 'glx-tls', ++ type : 'boolean', ++ value : true, ++ description : 'Enable TLS support in GLX', ++) ++option( + 'I-love-half-baked-turnips', + type : 'boolean', + value : false, +-- +2.11.1 + diff --git a/meta-amd-bsp/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/meta-amd-bsp/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch new file mode 100644 index 00000000..dfdd778a --- /dev/null +++ b/meta-amd-bsp/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch @@ -0,0 +1,46 @@ +From 749880b5122f2cad82731cba6b3845ca364dcb29 Mon Sep 17 00:00:00 2001 +From: "Arsalan H. Awan" <Arsalan_Awan@mentor.com> +Date: Mon, 19 Aug 2019 17:35:19 +0500 +Subject: [PATCH 3/3] Allow enable DRI without DRI drivers + +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com> +--- + meson.build | 2 +- + meson_options.txt | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bb6e3083c20..7f4cfffc64a 100644 +--- a/meson.build ++++ b/meson.build +@@ -136,7 +136,7 @@ with_dri_r200 = dri_drivers.contains('r200') + with_dri_nouveau = dri_drivers.contains('nouveau') + with_dri_swrast = dri_drivers.contains('swrast') + +-with_dri = dri_drivers.length() != 0 and dri_drivers != [''] ++with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != ['']) + + gallium_drivers = get_option('gallium-drivers') + if gallium_drivers.contains('auto') +diff --git a/meson_options.txt b/meson_options.txt +index c0ce8d8c8bf..29031134617 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -35,6 +35,12 @@ option( + description : 'enable support for dri3' + ) + option( ++ 'dri', ++ type : 'boolean', ++ value : false, ++ description : 'enable support for dri' ++) ++option( + 'dri-drivers', + type : 'array', + value : ['auto'], +-- +2.11.1 + |