Update to 24.0.4

This commit is contained in:
José Expósito 2024-04-01 13:19:11 +02:00
parent 5c31c47163
commit 1604f1b352
3 changed files with 2 additions and 38 deletions

View file

@ -1,35 +0,0 @@
From 99017891cad55972c26c0ca8354f48e722b37a66 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
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 <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28240>
---
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 2e1d9c488e2..7979cad75fa 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)
--
2.44.0

View file

@ -62,7 +62,7 @@
Name: mesa
Summary: Mesa graphics libraries
%global ver 24.0.3
%global ver 24.0.4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: %autorelease
License: MIT AND BSD-3-Clause AND SGI-B-2.0
@ -79,7 +79,6 @@ Patch10: gnome-shell-glthread-disable.patch
# Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28101
# to fix LLVM 18 compatibility (https://bugzilla.redhat.com/show_bug.cgi?id=2268800).
Patch20: 0001-Pass-no-verify-fixpoint-option-to-instcombine-in-LLV.patch
Patch21: 0001-winsys-radeon-pass-priv-instead-NULL-to-radeon_bo_ca.patch
# Fix broken rendering with new GTK4 renderer on Raspberry Pi
# https://bugzilla.redhat.com/show_bug.cgi?id=2269412

View file

@ -1 +1 @@
SHA512 (mesa-24.0.3.tar.xz) = 76b3b479877c40f729d7f530af4e3577fa74363edcd3d9474350d498a51dbb761fc034b39bee8547e97c30fd3a520cbc50c742d5a187746e83ddab1df44f37e9
SHA512 (mesa-24.0.4.tar.xz) = 1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515