Commit 2e828a25 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/mes: use correct MES pipe for resets 



Use the KIQ pipe for kernel queues and the SCHED pipe for
user queues.

Fixes: 2408b027 ("drm/amdgpu/mes: consolidate on a single mes reset callback")
Cc: Michael Chen <Michael.Chen@amd.com>
Cc: Shaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: default avatarMichael Chen <michael.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2408b027

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ int amdgpu_mes_reset_legacy_queue(struct amdgpu_device *adev, 
	queue_input.wptr_addr = ring->wptr_gpu_addr;

	queue_input.vmid = vmid;

	queue_input.use_mmio = use_mmio;

	queue_input.is_kq = true;

	if (ring->funcs->type == AMDGPU_RING_TYPE_GFX)

		queue_input.legacy_gfx = true;

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ struct mes_reset_queue_input { 
	uint64_t                           wptr_addr;

	uint32_t                           vmid;

	bool                               legacy_gfx;

	bool                               is_kq;

};



enum mes_misc_opcode {

drivers/gpu/drm/amd/amdgpu/mes_v12_0.c

+1 −1
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static int mes_v12_0_reset_hw_queue(struct amdgpu_mes *mes, 
		mes_reset_queue_pkt.doorbell_offset = input->doorbell_offset;

	}



	if (mes->adev->enable_uni_mes)

	if (input->is_kq)

		pipe = AMDGPU_MES_KIQ_PIPE;

	else

		pipe = AMDGPU_MES_SCHED_PIPE;