From a55efd6cb43a0bed7d65cb082f5d10026be094be Mon Sep 17 00:00:00 2001 From: liweigang Date: Mon, 23 Dec 2024 10:58:30 +0800 Subject: [PATCH] feat: winsys/radeon: pass priv instead NULL to radeon_bo_can_reclaim Signed-off-by: liweigang (cherry picked from commit 4e424b04ed51f6bc787d0d097541007d691f103b) --- ...nstead-NULL-to-radeon_bo_can_reclaim.patch | 35 +++++++++++++++++++ mesa.spec | 7 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 backport-pass-priv-instead-NULL-to-radeon_bo_can_reclaim.patch diff --git a/backport-pass-priv-instead-NULL-to-radeon_bo_can_reclaim.patch b/backport-pass-priv-instead-NULL-to-radeon_bo_can_reclaim.patch new file mode 100644 index 0000000..02e334e --- /dev/null +++ b/backport-pass-priv-instead-NULL-to-radeon_bo_can_reclaim.patch @@ -0,0 +1,35 @@ +From 99017891cad55972c26c0ca8354f48e722b37a66 Mon Sep 17 00:00:00 2001 +From: Pierre-Eric Pelloux-Prayer +Date: Mon, 18 Mar 2024 11:52:50 +0100 +Subject: [PATCH] winsys/radeon: pass priv instead NULL to + radeon_bo_can_reclaim +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes a NULL pointer issue. + +Fixes: 4a078e693e9 ("r300,r600,radeon/winsys: always pass the winsys to radeon_bo_reference") +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613 +Reviewed-by: Marek Ol拧谩k +Part-of: +--- + src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +index 2e1d9c488e2ca..7979cad75fac4 100644 +--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c ++++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +@@ -729,7 +729,7 @@ bool radeon_bo_can_reclaim_slab(void *priv, struct pb_slab_entry *entry) + { + struct radeon_bo *bo = container_of(entry, struct radeon_bo, u.slab.entry); + +- return radeon_bo_can_reclaim(NULL, &bo->base); ++ return radeon_bo_can_reclaim(priv, &bo->base); + } + + static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf) +-- +GitLab + diff --git a/mesa.spec b/mesa.spec index bba6a3e..a721adf 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 24.0.3 -Release: 2 +Release: 3 License: MIT URL: http://www.mesa3d.org @@ -62,6 +62,8 @@ Patch1: backport-fix-build-err-on-arm.patch Patch2: 0001-changed_by_upstream_26018_orcjit_patch.patch Patch3: 0001-llvmpipe-add-loongarch64-basic-support.patch Patch4: 0002-llvmpipe-support-loongarch64-orcjit.patch +# https://gitlab.freedesktop.org/mesa/mesa/-/commit/99017891cad55972c26c0ca8354f48e722b37a66 +Patch5: backport-pass-priv-instead-NULL-to-radeon_bo_can_reclaim.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -580,6 +582,9 @@ done %endif %changelog +* Mon Dec 23 2024 liweigang - 24.0.3-3 +- sync upstream issue + * Mon May 20 2024 zhaojiale - 24.0.3-2 - add upstream orcjit patch and support loongarch64 orcjit -- Gitee