Commit 3c75518c authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher

drm/amdgpu/mes12: switch SET_SHADER_DEBUGGER pkt to mes schq pipe

The SET_SHADER_DEBUGGER packet must work with the added
hardware queue, switch the packet submitting to mes schq pipe.
Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.11.x
parent 2ed186df
...@@ -479,6 +479,11 @@ static int mes_v12_0_misc_op(struct amdgpu_mes *mes, ...@@ -479,6 +479,11 @@ static int mes_v12_0_misc_op(struct amdgpu_mes *mes,
union MESAPI__MISC misc_pkt; union MESAPI__MISC misc_pkt;
int pipe; int pipe;
if (mes->adev->enable_uni_mes)
pipe = AMDGPU_MES_KIQ_PIPE;
else
pipe = AMDGPU_MES_SCHED_PIPE;
memset(&misc_pkt, 0, sizeof(misc_pkt)); memset(&misc_pkt, 0, sizeof(misc_pkt));
misc_pkt.header.type = MES_API_TYPE_SCHEDULER; misc_pkt.header.type = MES_API_TYPE_SCHEDULER;
...@@ -513,6 +518,7 @@ static int mes_v12_0_misc_op(struct amdgpu_mes *mes, ...@@ -513,6 +518,7 @@ static int mes_v12_0_misc_op(struct amdgpu_mes *mes,
misc_pkt.wait_reg_mem.reg_offset2 = input->wrm_reg.reg1; misc_pkt.wait_reg_mem.reg_offset2 = input->wrm_reg.reg1;
break; break;
case MES_MISC_OP_SET_SHADER_DEBUGGER: case MES_MISC_OP_SET_SHADER_DEBUGGER:
pipe = AMDGPU_MES_SCHED_PIPE;
misc_pkt.opcode = MESAPI_MISC__SET_SHADER_DEBUGGER; misc_pkt.opcode = MESAPI_MISC__SET_SHADER_DEBUGGER;
misc_pkt.set_shader_debugger.process_context_addr = misc_pkt.set_shader_debugger.process_context_addr =
input->set_shader_debugger.process_context_addr; input->set_shader_debugger.process_context_addr;
...@@ -530,11 +536,6 @@ static int mes_v12_0_misc_op(struct amdgpu_mes *mes, ...@@ -530,11 +536,6 @@ static int mes_v12_0_misc_op(struct amdgpu_mes *mes,
return -EINVAL; return -EINVAL;
} }
if (mes->adev->enable_uni_mes)
pipe = AMDGPU_MES_KIQ_PIPE;
else
pipe = AMDGPU_MES_SCHED_PIPE;
return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe, return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe,
&misc_pkt, sizeof(misc_pkt), &misc_pkt, sizeof(misc_pkt),
offsetof(union MESAPI__MISC, api_status)); offsetof(union MESAPI__MISC, api_status));
......
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