leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu/mes10.1: update mes initialization

Browse Source 
Update mes initialization sequence.

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Jack Xiao 2019-10-16 11:48:48 +08:00 committed by Alex Deucher
parent 03195e8063
commit 9ed60748fb
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
View File

@ -825,6 +825,7 @@ static int mes_v10_1_sw_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
adev->mes.adev = adev; adev->mes.adev = adev;
adev->mes.funcs = &mes_v10_1_funcs;
r = mes_v10_1_init_microcode(adev); r = mes_v10_1_init_microcode(adev);
if (r) if (r)
@ -875,20 +876,29 @@ static int mes_v10_1_hw_init(void *handle)
DRM_ERROR("failed to MES fw, r=%d\n", r); DRM_ERROR("failed to MES fw, r=%d\n", r);
return r; return r;
} }
} else {
DRM_ERROR("only support direct fw loading on MES\n");
return -EINVAL;
} }
mes_v10_1_enable(adev, true); mes_v10_1_enable(adev, true);
r = mes_v10_1_queue_init(adev); r = mes_v10_1_queue_init(adev);
if (r)
goto failure;
r = mes_v10_1_set_hw_resources(&adev->mes);
if (r)
goto failure;
r = mes_v10_1_query_sched_status(&adev->mes);
if (r) { if (r) {
mes_v10_1_hw_fini(adev); DRM_ERROR("MES is busy\n");
return r; goto failure;
} }
return 0; return 0;
failure:
mes_v10_1_hw_fini(adev);
return r;
} }
static int mes_v10_1_hw_fini(void *handle) static int mes_v10_1_hw_fini(void *handle)