diff options
Diffstat (limited to 'drivers/gpu/drm/amd/include/mes_v11_api_def.h')
| -rw-r--r-- | drivers/gpu/drm/amd/include/mes_v11_api_def.h | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/drivers/gpu/drm/amd/include/mes_v11_api_def.h b/drivers/gpu/drm/amd/include/mes_v11_api_def.h index e30064477d82..80dab1146439 100644 --- a/drivers/gpu/drm/amd/include/mes_v11_api_def.h +++ b/drivers/gpu/drm/amd/include/mes_v11_api_def.h @@ -193,7 +193,7 @@ struct MES_LOG_BUFFER { }; enum MES_SWIP_TO_HWIP_DEF { - MES_MAX_HWIP_SEGMENT = 6, + MES_MAX_HWIP_SEGMENT = 8, }; union MESAPI_SET_HW_RESOURCES { @@ -226,6 +226,8 @@ union MESAPI_SET_HW_RESOURCES { }; uint32_t uint32_t_all; }; + uint32_t oversubscription_timer; + uint64_t doorbell_info; }; uint32_t max_dwords_in_api[API_FRAME_SIZE_IN_DWORDS]; @@ -265,7 +267,8 @@ union MESAPI__ADD_QUEUE { uint32_t is_gang_suspended : 1; uint32_t is_tmz_queue : 1; uint32_t map_kiq_utility_queue : 1; - uint32_t reserved : 23; + uint32_t is_kfd_process : 1; + uint32_t reserved : 22; }; struct MES_API_STATUS api_status; uint64_t tma_addr; @@ -284,7 +287,8 @@ union MESAPI__REMOVE_QUEUE { uint32_t unmap_legacy_gfx_queue : 1; uint32_t unmap_kiq_utility_queue : 1; uint32_t preempt_legacy_gfx_queue : 1; - uint32_t reserved : 29; + uint32_t unmap_legacy_queue : 1; + uint32_t reserved : 28; }; struct MES_API_STATUS api_status; @@ -293,6 +297,8 @@ union MESAPI__REMOVE_QUEUE { uint64_t tf_addr; uint32_t tf_data; + + enum MES_QUEUE_TYPE queue_type; }; uint32_t max_dwords_in_api[API_FRAME_SIZE_IN_DWORDS]; @@ -506,27 +512,40 @@ union MESAPI__SET_DEBUG_VMID { }; enum MESAPI_MISC_OPCODE { - MESAPI_MISC__MODIFY_REG, + MESAPI_MISC__WRITE_REG, MESAPI_MISC__INV_GART, MESAPI_MISC__QUERY_STATUS, + MESAPI_MISC__READ_REG, + MESAPI_MISC__WAIT_REG_MEM, MESAPI_MISC__MAX, }; -enum MODIFY_REG_SUBCODE { - MODIFY_REG__OVERWRITE, - MODIFY_REG__RMW_OR, - MODIFY_REG__RMW_AND, - MODIFY_REG__MAX, -}; - enum { MISC_DATA_MAX_SIZE_IN_DWORDS = 20 }; -struct MODIFY_REG { - enum MODIFY_REG_SUBCODE subcode; +struct WRITE_REG { uint32_t reg_offset; uint32_t reg_value; }; +struct READ_REG { + uint32_t reg_offset; + uint64_t buffer_addr; +}; + +enum WRM_OPERATION { + WRM_OPERATION__WAIT_REG_MEM, + WRM_OPERATION__WR_WAIT_WR_REG, + WRM_OPERATION__MAX, +}; + +struct WAIT_REG_MEM { + enum WRM_OPERATION op; + uint32_t reference; + uint32_t mask; + uint32_t reg_offset1; + uint32_t reg_offset2; +}; + struct INV_GART { uint64_t inv_range_va_start; uint64_t inv_range_size; @@ -543,9 +562,11 @@ union MESAPI__MISC { struct MES_API_STATUS api_status; union { - struct MODIFY_REG modify_reg; + struct WRITE_REG write_reg; struct INV_GART inv_gart; struct QUERY_STATUS query_status; + struct READ_REG read_reg; + struct WAIT_REG_MEM wait_reg_mem; uint32_t data[MISC_DATA_MAX_SIZE_IN_DWORDS]; }; }; |