From: Jack Xiao Date: Mon, 7 Aug 2023 07:54:44 +0000 (+0800) Subject: drm/amdgpu: enable mes v12 self test X-Git-Tag: io_uring-6.11-20240722~49^2~25^2~445 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=745f46b6a99f;p=linux-block.git drm/amdgpu: enable mes v12 self test 1. fix available compute queue to use 2. enable mes v12 self test Signed-off-by: Jack Xiao Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c index 02ce69e3d1dd..ea06f8be133e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -156,7 +156,7 @@ int amdgpu_mes_init(struct amdgpu_device *adev) for (i = 0; i < AMDGPU_MES_MAX_COMPUTE_PIPES; i++) { /* use only 1st MEC pipes */ - if (i >= 4) + if (i >= adev->gfx.mec.num_pipe_per_mec) continue; adev->mes.compute_hqd_mask[i] = 0xc; } diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c index a9bf06ad0202..d20bb78280b1 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c @@ -1301,6 +1301,12 @@ static int mes_v12_0_early_init(void *handle) static int mes_v12_0_late_init(void *handle) { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + /* it's only intended for use in mes_self_test case, not for s0ix and reset */ + if (!amdgpu_in_reset(adev) && !adev->in_s0ix && !adev->in_suspend) + amdgpu_mes_self_test(adev); + return 0; }