Commit 55981bd2 authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher

drm/amdgpu/sriov:don't load psp fw during gpu reset

At least for SRIOV we found reload PSP fw during
gpu reset cause PSP hang.
Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3224a12b
...@@ -255,8 +255,10 @@ static int psp_asd_load(struct psp_context *psp) ...@@ -255,8 +255,10 @@ static int psp_asd_load(struct psp_context *psp)
static int psp_hw_start(struct psp_context *psp) static int psp_hw_start(struct psp_context *psp)
{ {
struct amdgpu_device *adev = psp->adev;
int ret; int ret;
if (!amdgpu_sriov_vf(adev) || !adev->in_sriov_reset) {
ret = psp_bootloader_load_sysdrv(psp); ret = psp_bootloader_load_sysdrv(psp);
if (ret) if (ret)
return ret; return ret;
...@@ -264,6 +266,7 @@ static int psp_hw_start(struct psp_context *psp) ...@@ -264,6 +266,7 @@ static int psp_hw_start(struct psp_context *psp)
ret = psp_bootloader_load_sos(psp); ret = psp_bootloader_load_sos(psp);
if (ret) if (ret)
return ret; return ret;
}
ret = psp_ring_create(psp, PSP_RING_TYPE__KM); ret = psp_ring_create(psp, PSP_RING_TYPE__KM);
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