[PATCH] drm/amdgpu: add SOS FW version checking for CAP

Zhigang Luo zhigang.luo at amd.com
Tue Mar 24 19:47:45 UTC 2020


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 at amd.com>
---
 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



More information about the amd-gfx mailing list