[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/mesa][debian-unstable] 2 commits: patches: Revert two commits on d3d12 that regressed at least swrast. (Closes: #1059971, #1060017)

Title: GitLab

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:

Changes:

  • debian/changelog
    1 
    +mesa (23.3.2-2) unstable; urgency=medium
    2 
    +
    3 
    +  * patches: Revert two commits on d3d12 that regressed at least swrast.
    4 
    +    (Closes: #1059971, #1060017)
    5 
    +
    6 
    + -- Timo Aaltonen <tjaalton@debian.org>  Fri, 05 Jan 2024 11:07:26 +0200
    7 
    +
    1 8 
     mesa (23.3.2-1) unstable; urgency=medium
    2 9
    3 10 
       [ Timo Aaltonen ]

  • debian/patches/0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
    1 
    +From 2382dca2c51423e2e50e23a1a8443d57321467e1 Mon Sep 17 00:00:00 2001
    2 
    +From: Sil Vilerino <sivileri@microsoft.com>
    3 
    +Date: Wed, 3 Jan 2024 09:22:52 -0500
    4 
    +Subject: [PATCH 1/2] Revert "d3d12: Only destroy the winsys during screen
    5 
    + destruction, not reset"
    6 
    +
    7 
    +This reverts commit 325fb6e26b62326c86514d263ffedd241fd36865.
    8 
    +
    9 
    +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10371
    10 
    +Fixes: 325fb6e26b6 ("d3d12: Only destroy the winsys during screen destruction, not reset")
    11 
    +Cc: mesa-stable
    12 
    +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26872>
    13 
    +(cherry picked from commit 97cc7ea5a591ed7afaddd00370de3ca62d55cbb4)
    14 
    +---
    15 
    + .pick_status.json                          | 2 +-
    16 
    + src/gallium/drivers/d3d12/d3d12_screen.cpp | 8 ++++----
    17 
    + 2 files changed, 5 insertions(+), 5 deletions(-)
    18 
    +
    19 
    +diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
    20 
    +index 9b0233fb9d9..ee74cf2b064 100644
    21 
    +--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
    22 
    ++++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
    23 
    +@@ -735,15 +735,15 @@ d3d12_deinit_screen(struct d3d12_screen *screen)
    24 
    +       screen->dev->Release();
    25 
    +       screen->dev = nullptr;
    26 
    +    }
    27 
    ++   if (screen->winsys) {
    28 
    ++      screen->winsys->destroy(screen->winsys);
    29 
    ++      screen->winsys = nullptr;
    30 
    ++   }
    31 
    + }
    32 
    +
    33 
    + void
    34 
    + d3d12_destroy_screen(struct d3d12_screen *screen)
    35 
    + {
    36 
    +-   if (screen->winsys) {
    37 
    +-      screen->winsys->destroy(screen->winsys);
    38 
    +-      screen->winsys = nullptr;
    39 
    +-   }
    40 
    +    slab_destroy_parent(&screen->transfer_pool);
    41 
    +    mtx_destroy(&screen->submit_mutex);
    42 
    +    mtx_destroy(&screen->descriptor_pool_mutex);
    43 
    +--
    44 
    +2.40.1
    45 
    +

  • debian/patches/0002-Revert-d3d12-Fix-screen-winsys-leak-in-d3d12_screen.patch
    1 
    +From 10b141aa89c42efab04e9ea77e4c52ed37621d28 Mon Sep 17 00:00:00 2001
    2 
    +From: Sil Vilerino <sivileri@microsoft.com>
    3 
    +Date: Wed, 3 Jan 2024 09:23:02 -0500
    4 
    +Subject: [PATCH 2/2] Revert "d3d12: Fix screen->winsys leak in d3d12_screen"
    5 
    +
    6 
    +This reverts commit 81c8e89ff8e846839fffc1d103b2080bef5c1b5c.
    7 
    +
    8 
    +Fixes: 81c8e89ff8e ("d3d12: Fix screen->winsys leak in d3d12_screen")
    9 
    +Cc: mesa-stable
    10 
    +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26872>
    11 
    +(cherry picked from commit e11605321aaf94e537751b09f3ec5133c385cc83)
    12 
    +---
    13 
    + .pick_status.json                          | 2 +-
    14 
    + src/gallium/drivers/d3d12/d3d12_screen.cpp | 4 ----
    15 
    + 2 files changed, 1 insertion(+), 5 deletions(-)
    16 
    +
    17 
    +diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
    18 
    +index ee74cf2b064..86faa25a074 100644
    19 
    +--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
    20 
    ++++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
    21 
    +@@ -735,10 +735,6 @@ d3d12_deinit_screen(struct d3d12_screen *screen)
    22 
    +       screen->dev->Release();
    23 
    +       screen->dev = nullptr;
    24 
    +    }
    25 
    +-   if (screen->winsys) {
    26 
    +-      screen->winsys->destroy(screen->winsys);
    27 
    +-      screen->winsys = nullptr;
    28 
    +-   }
    29 
    + }
    30 
    +
    31 
    + void
    32 
    +--
    33 
    +2.40.1
    34 
    +

  • debian/patches/series
    ... ... @@ -4,3 +4,5 @@ src_glx_dri_common.h.diff
    4 4 
     0001-Revert-egl-add-automatic-zink-fallback-loading-betwe.patch
    5 5 
     0002-Revert-glx-add-automatic-zink-fallback-loading-betwe.patch
    6 6 
     llvmpipe-add-orcjit.diff
    7 
    +0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
    8 
    +0002-Revert-d3d12-Fix-screen-winsys-leak-in-d3d12_screen.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: