start_cpsch map queues when kfd_init_node have race condition with IOMMUv2 init, and cause the gfx ring test failed later. Remove it from start_cpsch because map queues will be done when creating queues and resume queues. Reported-by: Michel Dänzer <michel@xxxxxxxxxxx> Signed-off-by: Philip Yang <Philip.Yang@xxxxxxx> --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 71b7f16c0173..a2d0d0bcf853 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -1658,9 +1658,6 @@ static int start_cpsch(struct device_queue_manager *dqm) dqm->is_resetting = false; dqm->sched_running = true; - if (!dqm->dev->kfd->shared_resources.enable_mes) - execute_queues_cpsch(dqm, KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES, 0, USE_DEFAULT_GRACE_PERIOD); - /* Set CWSR grace period to 1x1000 cycle for GFX9.4.3 APU */ if (amdgpu_emu_mode == 0 && dqm->dev->adev->gmc.is_app_apu && (KFD_GC_VERSION(dqm->dev) == IP_VERSION(9, 4, 3))) { -- 2.35.1