From 48d07fb7d3c0615697150037cf5a47655423deb0 Mon Sep 17 00:00:00 2001 From: Sarah Walker Date: Tue, 19 Jul 2022 10:27:44 +0100 Subject: [PATCH] pvr: Update FWIF compute register structure This matches changes made in FW 1.17.OS@6280047. Signed-off-by: Sarah Walker Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/vulkan/winsys/pvr_winsys.h | 4 ++-- .../vulkan/winsys/pvrsrvkm/fw-api/pvr_rogue_fwif.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/imagination/vulkan/winsys/pvr_winsys.h b/src/imagination/vulkan/winsys/pvr_winsys.h index a312ee49c1b..a69595ebd8d 100644 --- a/src/imagination/vulkan/winsys/pvr_winsys.h +++ b/src/imagination/vulkan/winsys/pvr_winsys.h @@ -307,12 +307,12 @@ struct pvr_winsys_compute_submit_info { struct { uint64_t tpu_border_colour_table; - uint64_t cdm_item; - uint32_t compute_cluster; uint64_t cdm_ctrl_stream_base; uint64_t cdm_ctx_state_base_addr; uint32_t tpu; uint32_t cdm_resume_pds1; + uint32_t cdm_item; + uint32_t compute_cluster; } regs; /* Must be 0 or a combination of PVR_WINSYS_COMPUTE_FLAG_* flags. */ diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/fw-api/pvr_rogue_fwif.h b/src/imagination/vulkan/winsys/pvrsrvkm/fw-api/pvr_rogue_fwif.h index a12a3f82c21..59041ff9d11 100644 --- a/src/imagination/vulkan/winsys/pvrsrvkm/fw-api/pvr_rogue_fwif.h +++ b/src/imagination/vulkan/winsys/pvrsrvkm/fw-api/pvr_rogue_fwif.h @@ -467,12 +467,6 @@ struct rogue_fwif_cmd_abort { struct rogue_fwif_cdm_regs { uint64_t tpu_border_colour_table; - /* Only used when feature COMPUTE_MORTON_CAPABLE present. */ - uint64_t cdm_item; - - /* Only used when feature CLUSTER_GROUPING present. */ - uint64_t compute_cluster; - /* Only used when feature TPU_DM_GLOBAL_REGISTERS present. */ uint64_t tpu_tag_cdm_ctrl; @@ -500,6 +494,12 @@ struct rogue_fwif_cdm_regs { uint32_t tpu; uint32_t cdm_resume_pds1; + + /* Only used when feature COMPUTE_MORTON_CAPABLE present. */ + uint32_t cdm_item; + + /* Only used when feature CLUSTER_GROUPING present. */ + uint32_t compute_cluster; }; /**