update to mesa 22.3.5

glthread got upstream fixed, and add a crocus fix
This commit is contained in:
Dave Airlie 2023-02-09 14:38:47 +10:00
parent c64ef71fa6
commit 19f731adbd
5 changed files with 35 additions and 26 deletions

View file

@ -0,0 +1,31 @@
From 9cd6cb449b4189472d57266e5c8e37c86271337b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 9 Feb 2023 12:59:53 +1000
Subject: [PATCH] crocus: disable Y tiling for render targets properly.
The old code would disallow linear targets as well which would confuse
things with reimporting dma-bufs.
Fixes: 32728dc66e36 ("crocus: introduce main resource configuration helper.")
---
src/gallium/drivers/crocus/crocus_resource.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/gallium/drivers/crocus/crocus_resource.c b/src/gallium/drivers/crocus/crocus_resource.c
index 7b4d50a6648..4f548eb7364 100644
--- a/src/gallium/drivers/crocus/crocus_resource.c
+++ b/src/gallium/drivers/crocus/crocus_resource.c
@@ -190,9 +190,7 @@ crocus_resource_configure_main(const struct crocus_screen *screen,
tiling_flags = 1 << res->mod_info->tiling;
} else {
if (templ->bind & PIPE_BIND_RENDER_TARGET && devinfo->ver < 6) {
- modifier = I915_FORMAT_MOD_X_TILED;
- res->mod_info = isl_drm_modifier_get_info(modifier);
- tiling_flags = 1 << res->mod_info->tiling;
+ tiling_flags &= ~ISL_TILING_Y0_BIT;
}
/* Use linear for staging buffers */
if (templ->usage == PIPE_USAGE_STAGING ||
--
2.39.1

View file

@ -1,11 +0,0 @@
diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma 2022-11-25 10:32:32.175879868 +1000
+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf 2022-11-25 10:32:43.743067470 +1000
@@ -653,6 +653,7 @@ TODO: document the other workarounds.
<application name="gnome-shell" executable="gnome-shell">
<option name="adaptive_sync" value="false" />
<option name="v3d_nonmsaa_texture_size_limit" value="true" />
+ <option name="mesa_glthread" value="false"/>
</application>
<application name="Desktop — Plasma" executable="plasmashell">
<option name="adaptive_sync" value="false" />

View file

@ -53,7 +53,7 @@
Name: mesa
Summary: Mesa graphics libraries
%global ver 22.3.4
%global ver 22.3.5
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: %autorelease
License: MIT
@ -65,8 +65,8 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
Source1: Mesa-MLAA-License-Clarification-Email.txt
Patch10: gnome-shell-glthread-disable.patch
Patch11: radeonsi-turn-off-glthread.patch
# fix crocus gnome-shell/webrtc captures
Patch1: 0001-crocus-disable-Y-tiling-for-render-targets-properly.patch
BuildRequires: meson >= 0.61.4
BuildRequires: gcc

View file

@ -1,11 +0,0 @@
diff -up mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
--- mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma 2023-01-25 06:17:54.993167334 +1000
+++ mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h 2023-01-25 06:17:57.363203425 +1000
@@ -1,7 +1,6 @@
// DriConf options specific to radeonsi
DRI_CONF_SECTION_PERFORMANCE
DRI_CONF_ADAPTIVE_SYNC(true)
-DRI_CONF_MESA_GLTHREAD(true)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_DEBUG

View file

@ -1 +1 @@
SHA512 (mesa-22.3.4.tar.xz) = 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d
SHA512 (mesa-22.3.5.tar.xz) = a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85