From b4d4799ce9dfd2eb9e1a5a3660dda242a525d68b Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Wed, 14 May 2025 18:55:39 -0700 Subject: [PATCH] panfrost: fix assertion failure compiling image conversion shaders In 59a3e12039c, we changed the UBO->push optimization in panfrost to only push UBOs that are available in a CPU buffer. We require first_ubo_is_default_ubo, to ensure that UBO0 will be a user buffer. We weren't setting this flag for the image conversion shaders, so got an assertion failure compiling them. This can be triggered by the panvk_force_afbc_packing driconf option. The conversion shader info UBO isn't exactly a "default" UBO in the sense of being lowered from uniforms, but it is a user buffer, so setting the flag should be fine. Fixes: 59a3e12039c ("panfrost: do not push "true" UBOs") Signed-off-by: Olivia Lee Reviewed-by: Boris Brezillon Reviewed-by: Eric R. Smith Part-of: (cherry picked from commit bed54fa4029e6d98becd2dafb4bed982ac94663b) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_mod_conv_cso.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 6bd2bb7f849..86be6f30cfb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2084,7 +2084,7 @@ "description": "panfrost: fix assertion failure compiling image conversion shaders", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "59a3e12039cde5df1451193557512b38cea0039e", "notes": null diff --git a/src/gallium/drivers/panfrost/pan_mod_conv_cso.c b/src/gallium/drivers/panfrost/pan_mod_conv_cso.c index 025fd4a7890..1619432640a 100644 --- a/src/gallium/drivers/panfrost/pan_mod_conv_cso.c +++ b/src/gallium/drivers/panfrost/pan_mod_conv_cso.c @@ -472,6 +472,9 @@ panfrost_get_mod_convert_shaders(struct panfrost_context *ctx, nir_shader *nir = \ panfrost_create_##name##_shader(screen, __VA_ARGS__); \ nir->info.num_ubos = 1; \ + /* "default" UBO is maybe not correct here, but in panfrost we're */ \ + /* using this as an indicator for whether UBO0 is a user UBO */ \ + nir->info.first_ubo_is_default_ubo = true; \ shader->name##_cso = pipe_shader_from_nir(pctx, nir); \ }