Module: Mesa Branch: main Commit: 079247e046368ef7b07f4d63080dde66409adbfc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=079247e046368ef7b07f4d63080dde66409adbfc
Author: Frank Binns <[email protected]> Date: Thu Nov 17 12:13:58 2022 +0000 pvr: remove start/stop transfer flags These are ignored by the pvrsrvkm KMD and don't exist in the new KMD. Signed-off-by: Frank Binns <[email protected]> Reviewed-by: Luigi santivetti <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21132> --- src/imagination/vulkan/winsys/pvr_winsys.h | 3 --- src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h | 8 -------- src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_transfer.c | 10 +--------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/imagination/vulkan/winsys/pvr_winsys.h b/src/imagination/vulkan/winsys/pvr_winsys.h index 880398baaf8..b039acfd340 100644 --- a/src/imagination/vulkan/winsys/pvr_winsys.h +++ b/src/imagination/vulkan/winsys/pvr_winsys.h @@ -250,9 +250,6 @@ struct pvr_winsys_transfer_ctx { struct pvr_winsys *ws; }; -#define PVR_WINSYS_TRANSFER_FLAG_START BITFIELD_BIT(0U) -#define PVR_WINSYS_TRANSFER_FLAG_END BITFIELD_BIT(1U) - #define PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT 16U #define PVR_TRANSFER_MAX_RENDER_TARGETS 3U diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h index 0df658c9c38..78c360648dc 100644 --- a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h +++ b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h @@ -106,14 +106,6 @@ #define DRM_IOCTL_SRVKM_INIT \ DRM_IOWR(DRM_COMMAND_BASE + DRM_SRVKM_INIT, struct drm_srvkm_init_data) -/****************************************************************************** - Bridge call specific defines - ******************************************************************************/ - -/* Flags for PVR_SRV_BRIDGE_RGXTQ_RGXSUBMITTRANSFER2 bridge call. */ -#define PVR_TRANSFER_PREP_FLAGS_START BITFIELD_BIT(5U) -#define PVR_TRANSFER_PREP_FLAGS_END BITFIELD_BIT(6U) - /****************************************************************************** Misc defines ******************************************************************************/ diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_transfer.c b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_transfer.c index c3dca0a9bce..f80317750ae 100644 --- a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_transfer.c +++ b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_transfer.c @@ -194,8 +194,8 @@ VkResult pvr_srv_winsys_transfer_submit( uint32_t client_update_count[PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT] = { 0 }; void **update_ufo_syc_prims[PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT] = { 0 }; uint32_t *update_values[PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT] = { 0 }; + uint32_t cmd_flags[PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT] = { 0 }; uint32_t cmd_sizes[PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT]; - uint32_t cmd_flags[PVR_TRANSFER_MAX_PREPARES_PER_SUBMIT]; struct pvr_srv_sync *srv_signal_sync; uint32_t job_num; @@ -215,14 +215,6 @@ VkResult pvr_srv_winsys_transfer_submit( for (uint32_t i = 0U; i < submit_info->cmd_count; i++) { cmd_sizes[i] = sizeof(**cmds_ptr_arr); - - cmd_flags[i] = 0; - if (submit_info->cmds[i].flags & PVR_WINSYS_TRANSFER_FLAG_START) - cmd_flags[i] |= PVR_TRANSFER_PREP_FLAGS_START; - - if (submit_info->cmds[i].flags & PVR_WINSYS_TRANSFER_FLAG_END) - cmd_flags[i] |= PVR_TRANSFER_PREP_FLAGS_END; - cmds_ptr_arr[i] = &transfer_cmds[i]; }
