Commit fba08a77 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher

drm/amdgpu/psp: perform tmr_init and asd_init after loading sysdrv/sos

Since from navi10, the tmr_size should be decided by psp sos according to
toc header. Driver should issue LOAD_TOC to psp sos to get the tmr_size needed.
The allocation of tmr_size then should be done only when sos/sysdrv loading
completed

Accordingly, asd_init also move to psp_hw_start after sos fw loading to make
calling sequence consistent.
Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5160709d
...@@ -776,12 +776,24 @@ static int psp_hw_start(struct psp_context *psp) ...@@ -776,12 +776,24 @@ static int psp_hw_start(struct psp_context *psp)
return ret; return ret;
} }
ret = psp_tmr_init(psp);
if (ret) {
DRM_ERROR("PSP tmr init failed!\n");
return ret;
}
ret = psp_tmr_load(psp); ret = psp_tmr_load(psp);
if (ret) { if (ret) {
DRM_ERROR("PSP load tmr failed!\n"); DRM_ERROR("PSP load tmr failed!\n");
return ret; return ret;
} }
ret = psp_asd_init(psp);
if (ret) {
DRM_ERROR("PSP asd init failed!\n");
return ret;
}
ret = psp_asd_load(psp); ret = psp_asd_load(psp);
if (ret) { if (ret) {
DRM_ERROR("PSP load asd failed!\n"); DRM_ERROR("PSP load asd failed!\n");
...@@ -997,18 +1009,6 @@ static int psp_load_fw(struct amdgpu_device *adev) ...@@ -997,18 +1009,6 @@ static int psp_load_fw(struct amdgpu_device *adev)
goto failed; goto failed;
} }
ret = psp_tmr_init(psp);
if (ret) {
DRM_ERROR("PSP tmr init failed!\n");
goto failed;
}
ret = psp_asd_init(psp);
if (ret) {
DRM_ERROR("PSP asd init failed!\n");
goto failed;
}
skip_memalloc: skip_memalloc:
ret = psp_hw_start(psp); ret = psp_hw_start(psp);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment