pan/decode: Rename pandecode_cs() into pandecode_interpret_cs()

pandecode_cs() does both the decoding and the interpretation.
Rename the function to avoid the confusion.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32284>
This commit is contained in:
Boris Brezillon
2024-11-24 19:31:00 +01:00
committed by Marge Bot
parent 1a8ef18aeb
commit 41d3f16a28
6 changed files with 22 additions and 19 deletions
+6 -5
View File
@@ -546,9 +546,9 @@ csf_submit_wait_and_dump(struct panfrost_batch *batch,
for (unsigned i = 0; i < gsubmit->queue_submits.count; i++) {
uint32_t regs[256] = {0};
pandecode_cs(dev->decode_ctx, qsubmits[i].stream_addr,
qsubmits[i].stream_size, panfrost_device_gpu_id(dev),
regs);
pandecode_interpret_cs(dev->decode_ctx, qsubmits[i].stream_addr,
qsubmits[i].stream_size,
panfrost_device_gpu_id(dev), regs);
}
if (dev->debug & PAN_DBG_DUMP)
@@ -1462,8 +1462,9 @@ GENX(csf_init_context)(struct panfrost_context *ctx)
if (dev->debug & PAN_DBG_TRACE) {
uint32_t regs[256] = {0};
pandecode_cs(dev->decode_ctx, qsubmit.stream_addr, qsubmit.stream_size,
panfrost_device_gpu_id(dev), regs);
pandecode_interpret_cs(dev->decode_ctx, qsubmit.stream_addr,
qsubmit.stream_size, panfrost_device_gpu_id(dev),
regs);
}
if (ret)
+2 -2
View File
@@ -130,8 +130,8 @@ void pandecode_abort_on_fault_v7(struct pandecode_context *ctx,
void pandecode_abort_on_fault_v9(struct pandecode_context *ctx,
mali_ptr jc_gpu_va);
void pandecode_cs_v10(struct pandecode_context *ctx, mali_ptr queue,
uint32_t size, unsigned gpu_id, uint32_t *regs);
void pandecode_interpret_cs_v10(struct pandecode_context *ctx, mali_ptr queue,
uint32_t size, unsigned gpu_id, uint32_t *regs);
/* Logging infrastructure */
static void
+3 -3
View File
@@ -417,14 +417,14 @@ pandecode_jc(struct pandecode_context *ctx, mali_ptr jc_gpu_va, unsigned gpu_id)
}
void
pandecode_cs(struct pandecode_context *ctx, mali_ptr queue_gpu_va,
uint32_t size, unsigned gpu_id, uint32_t *regs)
pandecode_interpret_cs(struct pandecode_context *ctx, mali_ptr queue_gpu_va,
uint32_t size, unsigned gpu_id, uint32_t *regs)
{
simple_mtx_lock(&ctx->lock);
switch (pan_arch(gpu_id)) {
case 10:
pandecode_cs_v10(ctx, queue_gpu_va, size, gpu_id, regs);
pandecode_interpret_cs_v10(ctx, queue_gpu_va, size, gpu_id, regs);
break;
default:
unreachable("Unsupported architecture");
+2 -2
View File
@@ -1038,8 +1038,8 @@ no_interpret:
}
void
GENX(pandecode_cs)(struct pandecode_context *ctx, mali_ptr queue, uint32_t size,
unsigned gpu_id, uint32_t *regs)
GENX(pandecode_interpret_cs)(struct pandecode_context *ctx, mali_ptr queue,
uint32_t size, unsigned gpu_id, uint32_t *regs)
{
pandecode_dump_file_open(ctx);
+3 -2
View File
@@ -61,8 +61,9 @@ void pandecode_inject_free(struct pandecode_context *ctx, uint64_t gpu_va,
void pandecode_jc(struct pandecode_context *ctx, uint64_t jc_gpu_va,
unsigned gpu_id);
void pandecode_cs(struct pandecode_context *ctx, mali_ptr queue_gpu_va,
uint32_t size, unsigned gpu_id, uint32_t *regs);
void pandecode_interpret_cs(struct pandecode_context *ctx,
mali_ptr queue_gpu_va, uint32_t size,
unsigned gpu_id, uint32_t *regs);
void pandecode_abort_on_fault(struct pandecode_context *ctx, uint64_t jc_gpu_va,
unsigned gpu_id);
+6 -5
View File
@@ -302,9 +302,9 @@ init_subqueue(struct panvk_queue *queue, enum panvk_subqueue_id subqueue)
"SyncobjWait failed: %m");
if (debug & PANVK_DEBUG_TRACE) {
pandecode_cs(dev->debug.decode_ctx, qsubmit.stream_addr,
qsubmit.stream_size, phys_dev->kmod.props.gpu_prod_id,
subq->reg_file);
pandecode_interpret_cs(dev->debug.decode_ctx, qsubmit.stream_addr,
qsubmit.stream_size,
phys_dev->kmod.props.gpu_prod_id, subq->reg_file);
pandecode_next_frame(dev->debug.decode_ctx);
}
@@ -788,8 +788,9 @@ panvk_queue_submit_process_debug(const struct panvk_queue_submit *submit)
pandecode_log(decode_ctx, "CS%d\n", subqueue);
simple_mtx_unlock(&decode_ctx->lock);
pandecode_cs(decode_ctx, qsubmit->stream_addr, qsubmit->stream_size,
props->gpu_prod_id, queue->subqueues[subqueue].reg_file);
pandecode_interpret_cs(decode_ctx, qsubmit->stream_addr,
qsubmit->stream_size, props->gpu_prod_id,
queue->subqueues[subqueue].reg_file);
}
}