Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdkfd: Send MES packets on correct XCC on GFX 12.1
Send the Set_Shader_Debugger packet on the correct MES pipe when
partition mode is set to non-SPX mode.
Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Alex Sierra <alex.sierra@amd.com>
Reviewed-by: Michael Chen <michael.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Mukul Joshi
and committed by
Alex Deucher
b78ec282
b6ac64ee
+6
-3
+4
-2
drivers/gpu/drm/amd/amdkfd/kfd_debug.c
+4
-2
drivers/gpu/drm/amd/amdkfd/kfd_debug.c
···
371
371
memset(pdd->proc_ctx_cpu_ptr, 0, AMDGPU_MES_PROC_CTX_SIZE);
372
372
}
373
373
374
-
return amdgpu_mes_set_shader_debugger(pdd->dev->adev, pdd->proc_ctx_gpu_addr, spi_dbg_cntl,
375
-
pdd->watch_points, flags, sq_trap_en, 0);
374
+
return amdgpu_mes_set_shader_debugger(pdd->dev->adev,
375
+
pdd->proc_ctx_gpu_addr, spi_dbg_cntl,
376
+
pdd->watch_points, flags, sq_trap_en,
377
+
ffs(pdd->dev->xcc_mask) - 1);
376
378
}
377
379
378
380
#define KFD_DEBUGGER_INVALID_WATCH_POINT_ID -1
+2
-1
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+2
-1
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
···
94
94
if (dev->kfd->shared_resources.enable_mes && !!pdd->proc_ctx_gpu_addr &&
95
95
down_read_trylock(&dev->adev->reset_domain->sem)) {
96
96
amdgpu_mes_flush_shader_debugger(dev->adev,
97
-
pdd->proc_ctx_gpu_addr, 0);
97
+
pdd->proc_ctx_gpu_addr,
98
+
ffs(pdd->dev->xcc_mask) - 1);
98
99
up_read(&dev->adev->reset_domain->sem);
99
100
}
100
101
pdd->already_dequeued = true;