From 0629cbe042ff0cefe28c7ebe8a80ec3fc8d5cd0d Mon Sep 17 00:00:00 2001 From: "Eric R. Smith" Date: Mon, 16 Mar 2026 18:53:15 -0300 Subject: [PATCH] panfrost: fix typos in architecture detection The preprocessor symbol we want is `PAN_ARCH`, not `MALI_ARCH`. Fixes: a21ee564e20 ("pan/bi: Make texel buffers use Attribute Buffers") Reviewed-by: Lars-Ivar Hesselberg Simonsen Reviewed-by: Erik Faye-Lund Reviewed-by: Lorenzo Rossi (cherry picked from commit 3945421c17add49787b9af40377b398e015fb848) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_cmdstream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 46dbc75e35b..8c52885a521 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6194,7 +6194,7 @@ "description": "panfrost: fix typos in architecture detection", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a21ee564e2051e5e6827ce333da1f85b8b828e1d", "notes": null diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 1659fcbb12a..fe17ff39777 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -2089,7 +2089,7 @@ emit_image_bufs(struct panfrost_batch *batch, mesa_shader_stage shader, panfrost_track_image_access(batch, shader, image); -#if MALI_ARCH >= 6 +#if PAN_ARCH >= 6 if (is_buffer) { pan_pack(bufs + (i * 2), ATTRIBUTE_BUFFER, cfg) { cfg.type = MALI_ATTRIBUTE_TYPE_1D; @@ -2110,7 +2110,7 @@ emit_image_bufs(struct panfrost_batch *batch, mesa_shader_stage shader, is_buffer ? 0 : image->u.tex.level); } -#if MALI_ARCH <= 5 +#if PAN_ARCH <= 5 if (is_buffer) { pan_cast_and_pack(&bufs[(i * 2) + 1], ATTRIBUTE_BUFFER_CONTINUATION_3D, cfg) {