Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits: ffd56d1b by Timo Aaltonen at 2024-01-05T11:07:25+02:00 patches: Revert two commits on d3d12 that regressed at least swrast. (Closes: #1059971, #1060017) - - - - - 0945a996 by Timo Aaltonen at 2024-01-05T11:07:35+02:00 release to sid - - - - - 4 changed files: - debian/changelog - + debian/patches/0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch - + debian/patches/0002-Revert-d3d12-Fix-screen-winsys-leak-in-d3d12_screen.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +mesa (23.3.2-2) unstable; urgency=medium + + * patches: Revert two commits on d3d12 that regressed at least swrast. + (Closes: #1059971, #1060017) + + -- Timo Aaltonen <[email protected]> Fri, 05 Jan 2024 11:07:26 +0200 + mesa (23.3.2-1) unstable; urgency=medium [ Timo Aaltonen ] ===================================== debian/patches/0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch ===================================== @@ -0,0 +1,45 @@ +From 2382dca2c51423e2e50e23a1a8443d57321467e1 Mon Sep 17 00:00:00 2001 +From: Sil Vilerino <[email protected]> +Date: Wed, 3 Jan 2024 09:22:52 -0500 +Subject: [PATCH 1/2] Revert "d3d12: Only destroy the winsys during screen + destruction, not reset" + +This reverts commit 325fb6e26b62326c86514d263ffedd241fd36865. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10371 +Fixes: 325fb6e26b6 ("d3d12: Only destroy the winsys during screen destruction, not reset") +Cc: mesa-stable +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26872> +(cherry picked from commit 97cc7ea5a591ed7afaddd00370de3ca62d55cbb4) +--- + .pick_status.json | 2 +- + src/gallium/drivers/d3d12/d3d12_screen.cpp | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp +index 9b0233fb9d9..ee74cf2b064 100644 +--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp ++++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp +@@ -735,15 +735,15 @@ d3d12_deinit_screen(struct d3d12_screen *screen) + screen->dev->Release(); + screen->dev = nullptr; + } ++ if (screen->winsys) { ++ screen->winsys->destroy(screen->winsys); ++ screen->winsys = nullptr; ++ } + } + + void + d3d12_destroy_screen(struct d3d12_screen *screen) + { +- if (screen->winsys) { +- screen->winsys->destroy(screen->winsys); +- screen->winsys = nullptr; +- } + slab_destroy_parent(&screen->transfer_pool); + mtx_destroy(&screen->submit_mutex); + mtx_destroy(&screen->descriptor_pool_mutex); +-- +2.40.1 + ===================================== debian/patches/0002-Revert-d3d12-Fix-screen-winsys-leak-in-d3d12_screen.patch ===================================== @@ -0,0 +1,34 @@ +From 10b141aa89c42efab04e9ea77e4c52ed37621d28 Mon Sep 17 00:00:00 2001 +From: Sil Vilerino <[email protected]> +Date: Wed, 3 Jan 2024 09:23:02 -0500 +Subject: [PATCH 2/2] Revert "d3d12: Fix screen->winsys leak in d3d12_screen" + +This reverts commit 81c8e89ff8e846839fffc1d103b2080bef5c1b5c. + +Fixes: 81c8e89ff8e ("d3d12: Fix screen->winsys leak in d3d12_screen") +Cc: mesa-stable +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26872> +(cherry picked from commit e11605321aaf94e537751b09f3ec5133c385cc83) +--- + .pick_status.json | 2 +- + src/gallium/drivers/d3d12/d3d12_screen.cpp | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp +index ee74cf2b064..86faa25a074 100644 +--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp ++++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp +@@ -735,10 +735,6 @@ d3d12_deinit_screen(struct d3d12_screen *screen) + screen->dev->Release(); + screen->dev = nullptr; + } +- if (screen->winsys) { +- screen->winsys->destroy(screen->winsys); +- screen->winsys = nullptr; +- } + } + + void +-- +2.40.1 + ===================================== debian/patches/series ===================================== @@ -4,3 +4,5 @@ src_glx_dri_common.h.diff 0001-Revert-egl-add-automatic-zink-fallback-loading-betwe.patch 0002-Revert-glx-add-automatic-zink-fallback-loading-betwe.patch llvmpipe-add-orcjit.diff +0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch +0002-Revert-d3d12-Fix-screen-winsys-leak-in-d3d12_screen.patch View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/26e0e0570a396fd9edddc916d4370b761eb97d01...0945a996ee0c6a636fd5239304b1534bd5f3d018 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/26e0e0570a396fd9edddc916d4370b761eb97d01...0945a996ee0c6a636fd5239304b1534bd5f3d018 You're receiving this email because of your account on salsa.debian.org.
