From 59e08ad78ce4176367ae36f2ddd6511df567f8ae Mon Sep 17 00:00:00 2001 From: Karmjit Mahil Date: Wed, 19 Jul 2023 13:13:33 +0100 Subject: [PATCH] pvr: Fix csb relocation status assert on `pvr_csb_finish()` The app might not have emitted any cs words before freeing resources so it is valid for the csb relocation mark to be uninitialised on `pvr_csb_finish()`. Fixes the assert being hit for: dEQP-VK.api.pipeline.pipeline_layout.lifetime.graphics Signed-off-by: Karmjit Mahil Reviewed-by: Luigi Santivetti Part-of: --- src/imagination/vulkan/pvr_csb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/imagination/vulkan/pvr_csb.c b/src/imagination/vulkan/pvr_csb.c index 0d2fa7c..170227b 100644 --- a/src/imagination/vulkan/pvr_csb.c +++ b/src/imagination/vulkan/pvr_csb.c @@ -105,7 +105,9 @@ void pvr_csb_init(struct pvr_device *device, void pvr_csb_finish(struct pvr_csb *csb) { #if defined(DEBUG) - assert(csb->relocation_mark_status == PVR_CSB_RELOCATION_MARK_CLEARED); + assert(csb->relocation_mark_status == + PVR_CSB_RELOCATION_MARK_UNINITIALIZED || + csb->relocation_mark_status == PVR_CSB_RELOCATION_MARK_CLEARED); #endif if (csb->stream_type == PVR_CMD_STREAM_TYPE_GRAPHICS_DEFERRED) { -- 2.7.4