Commit 6a4a1f60 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher

drm/amdgpu: add common interface for mes misc op

Add common interface for mes misc op, including accessing register
interface.
Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 90d5fd31
...@@ -119,6 +119,10 @@ struct amdgpu_mes { ...@@ -119,6 +119,10 @@ struct amdgpu_mes {
uint32_t query_status_fence_offs; uint32_t query_status_fence_offs;
uint64_t query_status_fence_gpu_addr; uint64_t query_status_fence_gpu_addr;
uint64_t *query_status_fence_ptr; uint64_t *query_status_fence_ptr;
uint32_t read_val_offs;
uint64_t read_val_gpu_addr;
uint32_t *read_val_ptr;
uint32_t saved_flags; uint32_t saved_flags;
/* initialize kiq pipe */ /* initialize kiq pipe */
...@@ -246,6 +250,36 @@ struct mes_resume_gang_input { ...@@ -246,6 +250,36 @@ struct mes_resume_gang_input {
uint64_t gang_context_addr; uint64_t gang_context_addr;
}; };
enum mes_misc_opcode {
MES_MISC_OP_WRITE_REG,
MES_MISC_OP_READ_REG,
MES_MISC_OP_WRM_REG_WAIT,
MES_MISC_OP_WRM_REG_WR_WAIT,
};
struct mes_misc_op_input {
enum mes_misc_opcode op;
union {
struct {
uint32_t reg_offset;
uint64_t buffer_addr;
} read_reg;
struct {
uint32_t reg_offset;
uint32_t reg_value;
} write_reg;
struct {
uint32_t ref;
uint32_t mask;
uint32_t reg0;
uint32_t reg1;
} wrm_reg;
};
};
struct amdgpu_mes_funcs { struct amdgpu_mes_funcs {
int (*add_hw_queue)(struct amdgpu_mes *mes, int (*add_hw_queue)(struct amdgpu_mes *mes,
struct mes_add_queue_input *input); struct mes_add_queue_input *input);
...@@ -261,6 +295,9 @@ struct amdgpu_mes_funcs { ...@@ -261,6 +295,9 @@ struct amdgpu_mes_funcs {
int (*resume_gang)(struct amdgpu_mes *mes, int (*resume_gang)(struct amdgpu_mes *mes,
struct mes_resume_gang_input *input); struct mes_resume_gang_input *input);
int (*misc_op)(struct amdgpu_mes *mes,
struct mes_misc_op_input *input);
}; };
#define amdgpu_mes_kiq_hw_init(adev) (adev)->mes.kiq_hw_init((adev)) #define amdgpu_mes_kiq_hw_init(adev) (adev)->mes.kiq_hw_init((adev))
...@@ -293,6 +330,15 @@ int amdgpu_mes_unmap_legacy_queue(struct amdgpu_device *adev, ...@@ -293,6 +330,15 @@ int amdgpu_mes_unmap_legacy_queue(struct amdgpu_device *adev,
enum amdgpu_unmap_queues_action action, enum amdgpu_unmap_queues_action action,
u64 gpu_addr, u64 seq); u64 gpu_addr, u64 seq);
uint32_t amdgpu_mes_rreg(struct amdgpu_device *adev, uint32_t reg);
int amdgpu_mes_wreg(struct amdgpu_device *adev,
uint32_t reg, uint32_t val);
int amdgpu_mes_reg_wait(struct amdgpu_device *adev, uint32_t reg,
uint32_t val, uint32_t mask);
int amdgpu_mes_reg_write_reg_wait(struct amdgpu_device *adev,
uint32_t reg0, uint32_t reg1,
uint32_t ref, uint32_t mask);
int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
int queue_type, int idx, int queue_type, int idx,
struct amdgpu_mes_ctx_data *ctx_data, struct amdgpu_mes_ctx_data *ctx_data,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment