From 6c6372770ca110dc7c1933d14225a75cf37efa6d Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 9 Dec 2019 08:41:07 -0500 Subject: [PATCH] panfrost: Rename unknown_address_0 -> scratchpad It's the analogue pointer in SFBD. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/pan_context.c | 2 +- src/panfrost/include/panfrost-job.h | 3 ++- src/panfrost/pandecode/decode.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 069a517e0db..d24d440be7c 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -135,7 +135,7 @@ panfrost_emit_sfbd(struct panfrost_batch *batch, unsigned vertex_count) .unk3 = 0x3, }, .clear_flags = 0x1000, - .unknown_address_0 = panfrost_batch_get_scratchpad(batch)->gpu, + .scratchpad = panfrost_batch_get_scratchpad(batch)->gpu, .tiler = panfrost_emit_midg_tiler(batch, vertex_count), }; diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index 53e4f59f121..2dbda7e8135 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -1470,7 +1470,8 @@ struct mali_sfbd_format { struct mali_single_framebuffer { u32 unknown1; u32 unknown2; - u64 unknown_address_0; + mali_ptr scratchpad; + u64 zero1; u64 zero0; diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c index c266f82fae8..39ece0c2b46 100644 --- a/src/panfrost/pandecode/decode.c +++ b/src/panfrost/pandecode/decode.c @@ -753,7 +753,7 @@ pandecode_sfbd(uint64_t gpu_va, int job_no, bool is_fragment, unsigned gpu_id) pandecode_prop("clear_stencil = 0x%x", s->clear_stencil); } - MEMORY_PROP(s, unknown_address_0); + MEMORY_PROP(s, scratchpad); const struct midgard_tiler_descriptor t = s->tiler; bool has_hierarchy = !(gpu_id == 0x0720 || gpu_id == 0x0820 || gpu_id == 0x0830); -- 2.30.2