Commit 5ad25ace authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: Unmap legacy queue when MES is enabled 



This fixes a kernel oops when MES is not enabled.

Reported-by: default avatarKenny Ho <Kenny.Ho@amd.com>
Suggested-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarAlex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Fixes: 18ee4ce6 ("drm/amdgpu: add mes unmap legacy queue routine")
Fixes: 3d879e81 ("drm/amdgpu: add init support for GFX11 (v2)")
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 494c1432

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

+1 −1
Original line number Diff line number Diff line
@@ -3568,7 +3568,7 @@ static void gfx10_kiq_unmap_queues(struct amdgpu_ring *kiq_ring, 
	struct amdgpu_device *adev = kiq_ring->adev;

	uint32_t eng_sel = ring->funcs->type == AMDGPU_RING_TYPE_GFX ? 4 : 0;



	if (!adev->gfx.kiq.ring.sched.ready) {

	if (adev->enable_mes && !adev->gfx.kiq.ring.sched.ready) {

		amdgpu_mes_unmap_legacy_queue(adev, ring, action, gpu_addr, seq);

		return;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void gfx11_kiq_unmap_queues(struct amdgpu_ring *kiq_ring, 
	struct amdgpu_device *adev = kiq_ring->adev;

	uint32_t eng_sel = ring->funcs->type == AMDGPU_RING_TYPE_GFX ? 4 : 0;



	if (!adev->gfx.kiq.ring.sched.ready) {

	if (adev->enable_mes && !adev->gfx.kiq.ring.sched.ready) {

		amdgpu_mes_unmap_legacy_queue(adev, ring, action, gpu_addr, seq);

		return;

	}