mesa: 24.0.3 -> 24.0.4
Remove backport-radeon-crash-fix.patch added in commit 3ecdb72
Since merged into upstream
This commit is contained in:
parent
6177b963e0
commit
93fbdd30ad
|
@ -1,13 +0,0 @@
|
|||
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)
|
|
@ -81,8 +81,8 @@
|
|||
# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
|
||||
|
||||
let
|
||||
version = "24.0.3";
|
||||
hash = "sha256-d67JoqN7fTWW6hZAs8xT0LXZs7Uqvtid4H43F+kb/b4=";
|
||||
version = "24.0.4";
|
||||
hash = "sha256-kP69MKCYy82X/2Lsw9z1yT129/oxTelEz86BlRunRfA=";
|
||||
|
||||
# Release calendar: https://www.mesa3d.org/release-calendar.html
|
||||
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
|
||||
|
@ -141,11 +141,6 @@ self = stdenv.mkDerivation {
|
|||
|
||||
patches = [
|
||||
./opencl.patch
|
||||
|
||||
# Backport crash fix for Radeon (legacy) kernel driver
|
||||
# see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613
|
||||
# FIXME: remove when merged upstream
|
||||
./backport-radeon-crash-fix.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
Loading…
Reference in New Issue