From ae9316f8128bec52c3ed5f06f341103241af24e1 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 13 Jan 2022 17:32:35 -0500 Subject: [PATCH] pan/decode: Decode Valhall surface descriptor Instead of incorrectly falling down the Bifrost path. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/lib/genxml/decode.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/panfrost/lib/genxml/decode.c b/src/panfrost/lib/genxml/decode.c index a57a8562fb6..522d44c2542 100644 --- a/src/panfrost/lib/genxml/decode.c +++ b/src/panfrost/lib/genxml/decode.c @@ -607,6 +607,7 @@ pandecode_shader_disassemble(mali_ptr shader_ptr, int shader_no, int type, return stats; } +#if PAN_ARCH <= 7 static void pandecode_texture_payload(mali_ptr payload, enum mali_texture_dimension dim, @@ -664,6 +665,7 @@ pandecode_texture_payload(mali_ptr payload, pandecode_indent--; pandecode_log("},\n"); } +#endif #if PAN_ARCH <= 5 static void @@ -695,12 +697,20 @@ pandecode_bifrost_texture( pan_unpack(cl, TEXTURE, temp); DUMP_UNPACKED(TEXTURE, temp, "Texture:\n") + pandecode_indent++; + +#if PAN_ARCH >= 9 + /* TODO: count */ + for (unsigned i = 0; i < 4; ++i) + DUMP_ADDR(SURFACE_WITH_STRIDE, temp.surfaces + i * pan_size(SURFACE_WITH_STRIDE), "Surface %u:\n", i); +#else struct pandecode_mapped_memory *tmem = pandecode_find_mapped_gpu_mem_containing(temp.surfaces); unsigned nr_samples = temp.dimension == MALI_TEXTURE_DIMENSION_3D ? 1 : temp.sample_count; - pandecode_indent++; + pandecode_texture_payload(temp.surfaces, temp.dimension, temp.texel_ordering, true, temp.levels, nr_samples, temp.array_size, tmem); +#endif pandecode_indent--; } #endif