From: Likun Gao Date: Mon, 20 Jan 2020 19:22:32 +0000 (+0800) Subject: drm/amdgpu: only send one sdma firmware for sienna_cichlid X-Git-Tag: v5.9-rc1~51^2~25^2~309 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=738c822c7ff513bfe5ebbfc195ec668681a0daf3;p=linux-2.6-block.git drm/amdgpu: only send one sdma firmware for sienna_cichlid As all four sdma firmware are same, PSP only receive one SDMA fw. Signed-off-by: Likun Gao Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 4ed542b69377..2fd40d0d7a0e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1683,6 +1683,15 @@ static int psp_np_fw_load(struct psp_context *psp) if (fw_load_skip_check(psp, ucode)) continue; + if (psp->autoload_supported && + adev->asic_type == CHIP_SIENNA_CICHLID && + (ucode->ucode_id == AMDGPU_UCODE_ID_SDMA1 || + ucode->ucode_id == AMDGPU_UCODE_ID_SDMA2 || + ucode->ucode_id == AMDGPU_UCODE_ID_SDMA3)) + /* PSP only receive one SDMA fw for sienna_cichlid, + * as all four sdma fw are same */ + continue; + psp_print_fw_hdr(psp, ucode); ret = psp_execute_np_fw_load(psp, ucode);