From 5c00efa695d81deb7561bd4f6ce910622cd032b4 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 15 Aug 2022 23:52:52 +0000 Subject: [PATCH] pan/decode: Centrally declare pandecode entrypoints Deduplicate in preparation for CSF. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- src/panfrost/lib/genxml/decode.h | 16 ++++++++++++---- src/panfrost/lib/genxml/decode_common.c | 12 ------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/panfrost/lib/genxml/decode.h b/src/panfrost/lib/genxml/decode.h index a5c94029b3f..6fa6014eb0e 100644 --- a/src/panfrost/lib/genxml/decode.h +++ b/src/panfrost/lib/genxml/decode.h @@ -85,10 +85,18 @@ __pandecode_fetch_gpu_mem(uint64_t gpu_va, size_t size, name = __pandecode_fetch_gpu_mem(gpu_va, sizeof(*name), \ __LINE__, __FILE__) -#ifdef PAN_ARCH -void GENX(pandecode_jc)(mali_ptr jc_gpu_va, unsigned gpu_id); -void GENX(pandecode_abort_on_fault)(mali_ptr jc_gpu_va); -#endif +/* Forward declare for all supported gens to permit thunking */ +void pandecode_jc_v4(mali_ptr jc_gpu_va, unsigned gpu_id); +void pandecode_jc_v5(mali_ptr jc_gpu_va, unsigned gpu_id); +void pandecode_jc_v6(mali_ptr jc_gpu_va, unsigned gpu_id); +void pandecode_jc_v7(mali_ptr jc_gpu_va, unsigned gpu_id); +void pandecode_jc_v9(mali_ptr jc_gpu_va, unsigned gpu_id); + +void pandecode_abort_on_fault_v4(mali_ptr jc_gpu_va); +void pandecode_abort_on_fault_v5(mali_ptr jc_gpu_va); +void pandecode_abort_on_fault_v6(mali_ptr jc_gpu_va); +void pandecode_abort_on_fault_v7(mali_ptr jc_gpu_va); +void pandecode_abort_on_fault_v9(mali_ptr jc_gpu_va); static inline void pan_hexdump(FILE *fp, const uint8_t *hex, size_t cnt, bool with_strings) diff --git a/src/panfrost/lib/genxml/decode_common.c b/src/panfrost/lib/genxml/decode_common.c index 786848e434d..18f3ed11d8c 100644 --- a/src/panfrost/lib/genxml/decode_common.c +++ b/src/panfrost/lib/genxml/decode_common.c @@ -300,12 +300,6 @@ pandecode_dump_mappings(void) simple_mtx_unlock(&pandecode_lock); } -void pandecode_abort_on_fault_v4(mali_ptr jc_gpu_va); -void pandecode_abort_on_fault_v5(mali_ptr jc_gpu_va); -void pandecode_abort_on_fault_v6(mali_ptr jc_gpu_va); -void pandecode_abort_on_fault_v7(mali_ptr jc_gpu_va); -void pandecode_abort_on_fault_v9(mali_ptr jc_gpu_va); - void pandecode_abort_on_fault(mali_ptr jc_gpu_va, unsigned gpu_id) { @@ -323,12 +317,6 @@ pandecode_abort_on_fault(mali_ptr jc_gpu_va, unsigned gpu_id) simple_mtx_unlock(&pandecode_lock); } -void pandecode_jc_v4(mali_ptr jc_gpu_va, unsigned gpu_id); -void pandecode_jc_v5(mali_ptr jc_gpu_va, unsigned gpu_id); -void pandecode_jc_v6(mali_ptr jc_gpu_va, unsigned gpu_id); -void pandecode_jc_v7(mali_ptr jc_gpu_va, unsigned gpu_id); -void pandecode_jc_v9(mali_ptr jc_gpu_va, unsigned gpu_id); - void pandecode_jc(mali_ptr jc_gpu_va, unsigned gpu_id) {