From 7b5bda3fccf614d098bf56dbf4471ca73ac22d40 Mon Sep 17 00:00:00 2001 From: Lars-Ivar Hesselberg Simonsen Date: Tue, 4 Nov 2025 16:03:47 +0100 Subject: [PATCH] pan/format: Disable PAN_BIND_STORAGE_IMAGE for RGBA4/BGRA4 The RGBA4/BGRA4 formats had the PAN_BIND_STORAGE_IMAGE set, but we cannot support that. Fixes: d95423686fd ("pan/format: Add PAN_BIND_STORAGE_IMAGE flag") Reviewed-by: Erik Faye-Lund Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit 15868cf6e9aa2fe8a8d3f431b3e89924a72f3529) --- .pick_status.json | 2 +- src/panfrost/lib/pan_format.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e7e1a4df8cb..f703c4f25fb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1144,7 +1144,7 @@ "description": "pan/format: Disable PAN_BIND_STORAGE_IMAGE for RGBA4/BGRA4", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d95423686fda6c8a96702b1535a967132f8887f8", "notes": null diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index e3aead96316..bb1b7812b2a 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -458,8 +458,8 @@ const struct pan_format GENX(pan_pipe_format)[PIPE_FORMAT_COUNT] = { FMT(R16G16B16_SSCALED, RGB16I, RGB1, L, V____), FMT(R16G16B16_SNORM, RGB16_SNORM, RGB1, L, V____), FMT(R16G16B16_UINT, RGB16UI, RGB1, L, V____), - FMT(R4G4B4A4_UNORM, RGBA4_UNORM, RGBA, L, VTR_I), - FMT(B4G4R4A4_UNORM, RGBA4_UNORM, BGRA, L, VTR_I), + FMT(R4G4B4A4_UNORM, RGBA4_UNORM, RGBA, L, VTR__), + FMT(B4G4R4A4_UNORM, RGBA4_UNORM, BGRA, L, VTR__), FMT(A4R4G4B4_UNORM, RGBA4_UNORM, ARGB, L, VTR__), FMT(A4B4G4R4_UNORM, RGBA4_UNORM, ABGR, L, VTR__), FMT(R16G16B16A16_UNORM, RGBA16_UNORM, RGBA, L, VTR_I),