From e1a55fe1b70243191088dcf9f645ae8871292f2a Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 7 Aug 2024 11:33:59 +0300 Subject: [PATCH] mesa: use upstream version of patch --- pkgs/development/libraries/mesa/default.nix | 8 +++++--- pkgs/development/libraries/mesa/vcn-pagefault.patch | 10 ---------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/vcn-pagefault.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6f3f7b45b569..3941606e3e9a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -139,10 +139,12 @@ in stdenv.mkDerivation { patches = [ ./opencl.patch - # Manual backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30510 # Fixes video corruption / crashes when decoding video on AMD iGPUs - # FIXME: remove when merged - ./vcn-pagefault.patch + # FIXME: remove in the next update + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/8b35da91b23afc65256b78a59d116fd09544cd28.patch"; + hash = "sha256-z0KKBtot3VxXiS16YcmwZbeg8HSCLzEbvWdufI/fOk8="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/mesa/vcn-pagefault.patch b/pkgs/development/libraries/mesa/vcn-pagefault.patch deleted file mode 100644 index 9b8c7b99c564..000000000000 --- a/pkgs/development/libraries/mesa/vcn-pagefault.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c -+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c -@@ -1390,6 +1390,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn - dummy->dpb.res; - addr = dec->ws->buffer_get_virtual_address(dummy_res->buf); - } -+ dec->ws->cs_add_buffer(&dec->cs, d->dpb.res->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, RADEON_DOMAIN_VRAM); - dynamic_dpb_t2->dpbAddrLo[i] = addr; - dynamic_dpb_t2->dpbAddrHi[i] = addr >> 32; - ++dynamic_dpb_t2->dpbArraySize;