Module: Mesa Branch: main Commit: 238f9a4498a5d7bde6c13a3b75fcd5f6b605a3ab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=238f9a4498a5d7bde6c13a3b75fcd5f6b605a3ab
Author: Boris Brezillon <boris.brezil...@collabora.com> Date: Wed Nov 15 11:57:01 2023 +0100 pan/decode: Make CSF decoding more robust to NULL pointers Some staging registers might be NULL, either because some arguments are optional, or because the command stream is malformed. In any case, being robust to such situations it probably a good thing. Signed-off-by: Boris Brezillon <boris.brezil...@collabora.com> Reviewed-by: Erik Faye-Lund <erik.faye-l...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26221> --- src/panfrost/lib/genxml/decode_csf.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/panfrost/lib/genxml/decode_csf.c b/src/panfrost/lib/genxml/decode_csf.c index 667b9a8763d..e9239af774e 100644 --- a/src/panfrost/lib/genxml/decode_csf.c +++ b/src/panfrost/lib/genxml/decode_csf.c @@ -147,9 +147,14 @@ pandecode_run_idvs(struct pandecode_context *ctx, FILE *fp, uint64_t vary_srt = cs_get_u64(qctx, reg_vary_srt); uint64_t frag_srt = cs_get_u64(qctx, reg_frag_srt); - GENX(pandecode_resource_tables)(ctx, position_srt, "Position resources"); - GENX(pandecode_resource_tables)(ctx, vary_srt, "Varying resources"); - GENX(pandecode_resource_tables)(ctx, frag_srt, "Fragment resources"); + if (position_srt) + GENX(pandecode_resource_tables)(ctx, position_srt, "Position resources"); + + if (vary_srt) + GENX(pandecode_resource_tables)(ctx, vary_srt, "Varying resources"); + + if (frag_srt) + GENX(pandecode_resource_tables)(ctx, frag_srt, "Fragment resources"); mali_ptr position_fau = cs_get_u64(qctx, reg_position_fau); mali_ptr vary_fau = cs_get_u64(qctx, reg_vary_fau); @@ -176,8 +181,10 @@ pandecode_run_idvs(struct pandecode_context *ctx, FILE *fp, GENX(pandecode_fau)(ctx, lo, hi, "Fragment FAU"); } - GENX(pandecode_shader) - (ctx, cs_get_u64(qctx, 16), "Position shader", qctx->gpu_id); + if (cs_get_u64(qctx, 16)) { + GENX(pandecode_shader) + (ctx, cs_get_u64(qctx, 16), "Position shader", qctx->gpu_id); + } if (tiler_flags.secondary_shader) { uint64_t ptr = cs_get_u64(qctx, 18); @@ -185,8 +192,10 @@ pandecode_run_idvs(struct pandecode_context *ctx, FILE *fp, GENX(pandecode_shader)(ctx, ptr, "Varying shader", qctx->gpu_id); } - GENX(pandecode_shader) - (ctx, cs_get_u64(qctx, 20), "Fragment shader", qctx->gpu_id); + if (cs_get_u64(qctx, 20)) { + GENX(pandecode_shader) + (ctx, cs_get_u64(qctx, 20), "Fragment shader", qctx->gpu_id); + } DUMP_ADDR(ctx, LOCAL_STORAGE, cs_get_u64(qctx, 24), "Position Local Storage @%" PRIx64 ":\n", @@ -247,7 +256,8 @@ pandecode_run_fragment(struct pandecode_context *ctx, struct queue_ctx *qctx, DUMP_CL(ctx, SCISSOR, &qctx->regs[42], "Scissor\n"); /* TODO: Tile enable map */ - GENX(pandecode_fbd)(ctx, cs_get_u64(qctx, 40), true, qctx->gpu_id); + GENX(pandecode_fbd) + (ctx, cs_get_u64(qctx, 40) & ~0x3full, true, qctx->gpu_id); ctx->indent--; }
