[AMD Official Use Only - Internal Distribution Only] Reviewed by : Shaoyun.liu <Shaoyun.liu@xxxxxxx> -----Original Message----- From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Zhigang Luo Sent: Tuesday, March 24, 2020 3:48 PM To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx Cc: Luo, Zhigang <Zhigang.Luo@xxxxxxx> Subject: [PATCH] drm/amdgpu: add SOS FW version checking for CAP To make sure the CAP feature is supported by the SOS, add SOS FW version checking before loading the CAP FW. Change-Id: I7aa1c09f9c117f67ede0db6cd5911d56c8568495 Signed-off-by: Zhigang Luo <zhigang.luo@xxxxxxx> --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index dc42086a672b..c2bf2d900039 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1407,6 +1407,11 @@ static int psp_np_fw_load(struct psp_context *psp) if (!ucode->fw) continue; + if (ucode->ucode_id == AMDGPU_UCODE_ID_CAP && + (psp->sos_fw_version < 0x80F5B)) + /* 0x80F5B is the first SOS FW version with CAP support */ + continue; + if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC && (psp_smu_reload_quirk(psp) || psp->autoload_supported || -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CShaoyun.Liu%40amd.com%7Cfb1e9b3393764955cf6c08d7d02c48ec%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637206761598725731&sdata=v9YpU%2BAGlVcDvXLvKTjzqMD0Xwzo35diNdBt4O3QwPM%3D&reserved=0 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
