mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 10:10:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amd/amdgpu: Fix MES init sequence

Browse source 
When MES is been used , the set_hw_resource_1 API is required to
initialize MES internal context correctly

Signed-off-by: Shaoyun Liu <shaoyun.liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Shaoyun Liu 2025-03-10 12:38:12 -04:00 committed by Alex Deucher
parent 13c13bdd1b
commit f81cd79311
4 changed files with 57 additions and 60 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
View file

@ -143,9 +143,9 @@ struct amdgpu_mes {
const struct amdgpu_mes_funcs *funcs; const struct amdgpu_mes_funcs *funcs;
/* mes resource_1 bo*/ /* mes resource_1 bo*/
struct amdgpu_bo *resource_1; struct amdgpu_bo *resource_1[AMDGPU_MAX_MES_PIPES];
uint64_t resource_1_gpu_addr; uint64_t resource_1_gpu_addr[AMDGPU_MAX_MES_PIPES];
void *resource_1_addr; void *resource_1_addr[AMDGPU_MAX_MES_PIPES];
}; };

9
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
View file

@ -614,10 +614,11 @@ static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev)
vf2pf_info->decode_usage = 0; vf2pf_info->decode_usage = 0;
vf2pf_info->dummy_page_addr = (uint64_t)adev->dummy_page_addr; vf2pf_info->dummy_page_addr = (uint64_t)adev->dummy_page_addr;
vf2pf_info->mes_info_addr = (uint64_t)adev->mes.resource_1_gpu_addr; if (amdgpu_sriov_is_mes_info_enable(adev)) {
vf2pf_info->mes_info_addr =
if (adev->mes.resource_1) { (uint64_t)(adev->mes.resource_1_gpu_addr[0] + AMDGPU_GPU_PAGE_SIZE);
vf2pf_info->mes_info_size = adev->mes.resource_1->tbo.base.size; vf2pf_info->mes_info_size =
adev->mes.resource_1[0]->tbo.base.size - AMDGPU_GPU_PAGE_SIZE;
} }
vf2pf_info->checksum = vf2pf_info->checksum =
amd_sriov_msg_checksum( amd_sriov_msg_checksum(

59
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
View file

@ -740,10 +740,13 @@ static int mes_v11_0_set_hw_resources_1(struct amdgpu_mes *mes)
mes_set_hw_res_pkt.header.opcode = MES_SCH_API_SET_HW_RSRC_1; mes_set_hw_res_pkt.header.opcode = MES_SCH_API_SET_HW_RSRC_1;
mes_set_hw_res_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS; mes_set_hw_res_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS;
mes_set_hw_res_pkt.enable_mes_info_ctx = 1; mes_set_hw_res_pkt.enable_mes_info_ctx = 1;
mes_set_hw_res_pkt.mes_info_ctx_mc_addr = mes->resource_1_gpu_addr;
mes_set_hw_res_pkt.mes_info_ctx_size = MES11_HW_RESOURCE_1_SIZE; mes_set_hw_res_pkt.cleaner_shader_fence_mc_addr = mes->resource_1_gpu_addr[0];
mes_set_hw_res_pkt.cleaner_shader_fence_mc_addr = if (amdgpu_sriov_is_mes_info_enable(mes->adev)) {
mes->resource_1_gpu_addr + MES11_HW_RESOURCE_1_SIZE; mes_set_hw_res_pkt.mes_info_ctx_mc_addr =
mes->resource_1_gpu_addr[0] + AMDGPU_GPU_PAGE_SIZE;
mes_set_hw_res_pkt.mes_info_ctx_size = MES11_HW_RESOURCE_1_SIZE;
}
return mes_v11_0_submit_pkt_and_poll_completion(mes, return mes_v11_0_submit_pkt_and_poll_completion(mes,
&mes_set_hw_res_pkt, sizeof(mes_set_hw_res_pkt), &mes_set_hw_res_pkt, sizeof(mes_set_hw_res_pkt),
@ -1381,7 +1384,7 @@ static int mes_v11_0_mqd_sw_init(struct amdgpu_device *adev,
static int mes_v11_0_sw_init(struct amdgpu_ip_block *ip_block) static int mes_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
{ {
struct amdgpu_device *adev = ip_block->adev; struct amdgpu_device *adev = ip_block->adev;
int pipe, r; int pipe, r, bo_size;
adev->mes.funcs = &mes_v11_0_funcs; adev->mes.funcs = &mes_v11_0_funcs;
adev->mes.kiq_hw_init = &mes_v11_0_kiq_hw_init; adev->mes.kiq_hw_init = &mes_v11_0_kiq_hw_init;
@ -1416,19 +1419,21 @@ static int mes_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
if (r) if (r)
return r; return r;
if (amdgpu_sriov_is_mes_info_enable(adev) || bo_size = AMDGPU_GPU_PAGE_SIZE;
adev->gfx.enable_cleaner_shader) { if (amdgpu_sriov_is_mes_info_enable(adev))
r = amdgpu_bo_create_kernel(adev, bo_size += MES11_HW_RESOURCE_1_SIZE;
MES11_HW_RESOURCE_1_SIZE + AMDGPU_GPU_PAGE_SIZE,
PAGE_SIZE, /* Only needed for AMDGPU_MES_SCHED_PIPE on MES 11*/
AMDGPU_GEM_DOMAIN_VRAM, r = amdgpu_bo_create_kernel(adev,
&adev->mes.resource_1, bo_size,
&adev->mes.resource_1_gpu_addr, PAGE_SIZE,
&adev->mes.resource_1_addr); AMDGPU_GEM_DOMAIN_VRAM,
if (r) { &adev->mes.resource_1[0],
dev_err(adev->dev, "(%d) failed to create mes resource_1 bo\n", r); &adev->mes.resource_1_gpu_addr[0],
return r; &adev->mes.resource_1_addr[0]);
} if (r) {
dev_err(adev->dev, "(%d) failed to create mes resource_1 bo\n", r);
return r;
} }
return 0; return 0;
@ -1439,11 +1444,8 @@ static int mes_v11_0_sw_fini(struct amdgpu_ip_block *ip_block)
struct amdgpu_device *adev = ip_block->adev; struct amdgpu_device *adev = ip_block->adev;
int pipe; int pipe;
if (amdgpu_sriov_is_mes_info_enable(adev) || amdgpu_bo_free_kernel(&adev->mes.resource_1[0], &adev->mes.resource_1_gpu_addr[0],
adev->gfx.enable_cleaner_shader) { &adev->mes.resource_1_addr[0]);
amdgpu_bo_free_kernel(&adev->mes.resource_1, &adev->mes.resource_1_gpu_addr,
&adev->mes.resource_1_addr);
}
for (pipe = 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) { for (pipe = 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) {
kfree(adev->mes.mqd_backup[pipe]); kfree(adev->mes.mqd_backup[pipe]);
@ -1632,13 +1634,10 @@ static int mes_v11_0_hw_init(struct amdgpu_ip_block *ip_block)
if (r) if (r)
goto failure; goto failure;
if (amdgpu_sriov_is_mes_info_enable(adev) || r = mes_v11_0_set_hw_resources_1(&adev->mes);
adev->gfx.enable_cleaner_shader) { if (r) {
r = mes_v11_0_set_hw_resources_1(&adev->mes); DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);
if (r) { goto failure;
DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);
goto failure;
}
} }
r = mes_v11_0_query_sched_status(&adev->mes); r = mes_v11_0_query_sched_status(&adev->mes);

43
drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
View file

@ -687,7 +687,7 @@ static int mes_v12_0_set_hw_resources_1(struct amdgpu_mes *mes, int pipe)
mes_set_hw_res_1_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS; mes_set_hw_res_1_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS;
mes_set_hw_res_1_pkt.mes_kiq_unmap_timeout = 0xa; mes_set_hw_res_1_pkt.mes_kiq_unmap_timeout = 0xa;
mes_set_hw_res_1_pkt.cleaner_shader_fence_mc_addr = mes_set_hw_res_1_pkt.cleaner_shader_fence_mc_addr =
mes->resource_1_gpu_addr; mes->resource_1_gpu_addr[pipe];
return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe, return mes_v12_0_submit_pkt_and_poll_completion(mes, pipe,
&mes_set_hw_res_1_pkt, sizeof(mes_set_hw_res_1_pkt), &mes_set_hw_res_1_pkt, sizeof(mes_set_hw_res_1_pkt),
@ -1519,23 +1519,22 @@ static int mes_v12_0_sw_init(struct amdgpu_ip_block *ip_block)
if (r) if (r)
return r; return r;
if (!adev->enable_uni_mes && pipe == AMDGPU_MES_KIQ_PIPE) if (!adev->enable_uni_mes && pipe == AMDGPU_MES_KIQ_PIPE) {
r = mes_v12_0_kiq_ring_init(adev); r = mes_v12_0_kiq_ring_init(adev);
else }
else {
r = mes_v12_0_ring_init(adev, pipe); r = mes_v12_0_ring_init(adev, pipe);
if (r) if (r)
return r; return r;
} r = amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_SIZE, PAGE_SIZE,
AMDGPU_GEM_DOMAIN_VRAM,
if (adev->enable_uni_mes) { &adev->mes.resource_1[pipe],
r = amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_SIZE, PAGE_SIZE, &adev->mes.resource_1_gpu_addr[pipe],
AMDGPU_GEM_DOMAIN_VRAM, &adev->mes.resource_1_addr[pipe]);
&adev->mes.resource_1, if (r) {
&adev->mes.resource_1_gpu_addr, dev_err(adev->dev, "(%d) failed to create mes resource_1 bo pipe[%d]\n", r, pipe);
&adev->mes.resource_1_addr); return r;
if (r) { }
dev_err(adev->dev, "(%d) failed to create mes resource_1 bo\n", r);
return r;
} }
} }
@ -1547,12 +1546,11 @@ static int mes_v12_0_sw_fini(struct amdgpu_ip_block *ip_block)
struct amdgpu_device *adev = ip_block->adev; struct amdgpu_device *adev = ip_block->adev;
int pipe; int pipe;
if (adev->enable_uni_mes)
amdgpu_bo_free_kernel(&adev->mes.resource_1,
&adev->mes.resource_1_gpu_addr,
&adev->mes.resource_1_addr);
for (pipe = 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) { for (pipe = 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) {
amdgpu_bo_free_kernel(&adev->mes.resource_1[pipe],
&adev->mes.resource_1_gpu_addr[pipe],
&adev->mes.resource_1_addr[pipe]);
kfree(adev->mes.mqd_backup[pipe]); kfree(adev->mes.mqd_backup[pipe]);
amdgpu_bo_free_kernel(&adev->mes.eop_gpu_obj[pipe], amdgpu_bo_free_kernel(&adev->mes.eop_gpu_obj[pipe],
@ -1751,8 +1749,7 @@ static int mes_v12_0_hw_init(struct amdgpu_ip_block *ip_block)
if (r) if (r)
goto failure; goto failure;
if (adev->enable_uni_mes) mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);
mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);
mes_v12_0_init_aggregated_doorbell(&adev->mes); mes_v12_0_init_aggregated_doorbell(&adev->mes);