diff options
| author | Tao Zhou <[email protected]> | 2020-07-28 04:44:59 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2020-08-26 20:40:19 +0000 |
| commit | c56c90f41343c0ec9606d7d297110ecc84c7f891 (patch) | |
| tree | fc7d55afae639d02db6779446dca3a462eb40572 /drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | |
| parent | drm/amd/pm: use kmemdup() rather than kmalloc+memcpy (diff) | |
| download | kernel-c56c90f41343c0ec9606d7d297110ecc84c7f891.tar.gz kernel-c56c90f41343c0ec9606d7d297110ecc84c7f891.zip | |
drm/amdgpu: add asd fw check before loading asd
asd is not ready for some ASICs in early stage, and psp->asd_fw is more generic than ASIC name in the check.
Signed-off-by: Tao Zhou <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
Reviewed-by: Jiansong Chen <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index c22fb0194df7..d6c38e24f130 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -522,8 +522,7 @@ static int psp_asd_load(struct psp_context *psp) * add workaround to bypass it for sriov now. * TODO: add version check to make it common */ - if (amdgpu_sriov_vf(psp->adev) || - (psp->adev->asic_type == CHIP_NAVY_FLOUNDER)) + if (amdgpu_sriov_vf(psp->adev) || !psp->asd_fw) return 0; cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL); |