From 6f2c61b467dd352ec930999cffd158cdd089641f Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 25 Mar 2025 22:17:34 +0800 Subject: [PATCH] fix(mesa): missmatched versions (#4158) Co-authored-by: Owen Zimmerman --- anda/lib/mesa/bazzite.patch | 73 +++++++++++++++++++++++++++++-------- anda/lib/mesa/mesa.spec | 2 +- 2 files changed, 58 insertions(+), 17 deletions(-) diff --git a/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch index 6c65577582..523c8c213f 100644 --- a/anda/lib/mesa/bazzite.patch +++ b/anda/lib/mesa/bazzite.patch @@ -1,7 +1,16 @@ -From eab8a4f9ad407b8c5c29123855a56b3698399be3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:39:08 +0100 +Subject: [BEGIN] SteamOS Changes + +-- +2.49.0 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 14 Jan 2022 15:58:45 +0100 -Subject: [PATCH 1/7] STEAMOS: radv: min image count override for FH5 +Subject: STEAMOS: radv: min image count override for FH5 Otherwise in combination with the vblank time reservation in gamescope the game could get stuck in low power states. @@ -27,11 +36,11 @@ index 72f3438b39d..02d7ada7ad9 100644 2.49.0 -From fd1d96636308b7216f246634cb75a20e45a3bd1b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 22 Feb 2024 22:32:45 +0100 -Subject: [PATCH 2/7] STEAMOS: Dynamic swapchain override for gamescope limiter - for DRI3 only +Subject: STEAMOS: Dynamic swapchain override for gamescope limiter for DRI3 + only The original patch (from Bas) contained WSI VK support too but it's been removed because the Gamescope WSI layer already handles that. @@ -134,11 +143,10 @@ index 9061e9755e2..6cc64be298a 100644 2.49.0 -From d2fe7734d135f785d4ac164c8fce779553f3ed19 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 24 Feb 2025 17:48:21 +0100 -Subject: [PATCH 3/7] radv: stop computing the UUID using the physical device - cache key +Subject: radv: stop computing the UUID using the physical device cache key Otherwise, the UUID changes for games that have shader-based drirc workarounds and this breaks precompiled shaders on SteamDeck. @@ -192,19 +200,19 @@ index 0d3660e7064..826c23a6c46 100644 2.49.0 -From b6b22ad82dcc2dc47b089a7ac018757809fa1a1c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:25 +0100 -Subject: [PATCH 4/7] [BEGIN] SteamOS Backports +Subject: [BEGIN] SteamOS Backports -- 2.49.0 -From 03830a554fe5e0a49c710e1c4b3b14f117325e5c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Natalie Vock Date: Fri, 28 Feb 2025 14:21:57 +0100 -Subject: [PATCH 5/7] radv/rt: Limit monolithic pipelines to 50 stages +Subject: radv/rt: Limit monolithic pipelines to 50 stages Beyond that, monolithic pipelines just bloat to incredible sizes, destroying compile times for questionable, if any, runtime perf benefit. @@ -240,19 +248,19 @@ index 5a23dc99cc4..1421688d580 100644 2.49.0 -From b013419f74e43edfe1da225b9641dea132d5897a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:33 +0100 -Subject: [PATCH 6/7] [BEGIN] Our Mesa backports +Subject: [BEGIN] Our Mesa backports -- 2.49.0 -From b45f046a4ebbbb1894e945a4cc2457674d9bf5ba Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Mon, 17 Feb 2025 14:55:29 -0800 -Subject: [PATCH 7/7] anv: Mark images with format modifiers set as scanout. +Subject: anv: Mark images with format modifiers set as scanout. We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout, but this only handles the linear case, and fails when drm format modifiers are used. @@ -286,3 +294,36 @@ index 1884932bbc7..cbc1b4aad87 100644 -- 2.49.0 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Mon, 24 Mar 2025 19:50:51 +0100 +Subject: Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM and GTT + allocations" + +This reverts commit 8c91624614c1f939974fe0d2d1a3baf83335cecb. + +Messes with AutoVRAM, who would have thought? +--- + src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +index 24ba28827f8..46461f8ee59 100644 +--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c ++++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +@@ -618,11 +618,6 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *aws, + if (flags & RADEON_FLAG_GTT_WC) + request.flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC; + +- if (aws->info.has_local_buffers && +- initial_domain & (RADEON_DOMAIN_VRAM_GTT | RADEON_DOMAIN_DOORBELL) && +- flags & RADEON_FLAG_NO_INTERPROCESS_SHARING) +- request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID; +- + if (flags & RADEON_FLAG_DISCARDABLE && + aws->info.drm_minor >= 47) + request.flags |= AMDGPU_GEM_CREATE_DISCARDABLE; +-- +2.49.0 + diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 23dfe20769..f19af8c08b 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.2 -Release: 2%?dist +Release: 4%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org