From 1ba20868c4c7a9155f5c4fc046295166cf7b83c3 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 7 Feb 2023 12:18:35 -0500 Subject: [PATCH] panvk: Take lock when tracing We're not supposed to call the GENX(pandecode_jc) routines (e.g. pandecode_jc_v7), since it's an internal interface that expects the caller to take a lock first. Instead we're supposed to call the non-GenXML pandecode_jc entrypoint which does the locking properly. Fixes assertion failures when tracing with recent pandecode: deqp-vk: ../src/util/simple_mtx.h:142: simple_mtx_assert_locked: Assertion `mtx->val' failed. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/vulkan/panvk_vX_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_device.c b/src/panfrost/vulkan/panvk_vX_device.c index 0edf1cb..d9cd931 100644 --- a/src/panfrost/vulkan/panvk_vX_device.c +++ b/src/panfrost/vulkan/panvk_vX_device.c @@ -78,8 +78,8 @@ panvk_queue_submit_batch(struct panvk_queue *queue, } if (debug & PANVK_DEBUG_TRACE) - GENX(pandecode_jc)(batch->scoreboard.first_job, pdev->gpu_id); - + pandecode_jc(batch->scoreboard.first_job, pdev->gpu_id); + if (debug & PANVK_DEBUG_DUMP) pandecode_dump_mappings(); } @@ -109,7 +109,7 @@ panvk_queue_submit_batch(struct panvk_queue *queue, } if (debug & PANVK_DEBUG_TRACE) - GENX(pandecode_jc)(batch->fragment_job, pdev->gpu_id); + pandecode_jc(batch->fragment_job, pdev->gpu_id); if (debug & PANVK_DEBUG_DUMP) pandecode_dump_mappings(); -- 2.7.4