* [PATCH] drm/amdgpu: add SOS FW version checking for CAP
@ 2020-03-24 19:47 Zhigang Luo
2020-03-24 21:30 ` Liu, Shaoyun
0 siblings, 1 reply; 2+ messages in thread
From: Zhigang Luo @ 2020-03-24 19:47 UTC (permalink / raw)
To: amd-gfx; +Cc: Zhigang Luo
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@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
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH] drm/amdgpu: add SOS FW version checking for CAP
2020-03-24 19:47 [PATCH] drm/amdgpu: add SOS FW version checking for CAP Zhigang Luo
@ 2020-03-24 21:30 ` Liu, Shaoyun
0 siblings, 0 replies; 2+ messages in thread
From: Liu, Shaoyun @ 2020-03-24 21:30 UTC (permalink / raw)
To: Luo, Zhigang, amd-gfx; +Cc: Luo, Zhigang
[AMD Official Use Only - Internal Distribution Only]
Reviewed by : Shaoyun.liu <Shaoyun.liu@amd.com>
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Zhigang Luo
Sent: Tuesday, March 24, 2020 3:48 PM
To: amd-gfx@lists.freedesktop.org
Cc: Luo, Zhigang <Zhigang.Luo@amd.com>
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@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
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-24 21:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-24 19:47 [PATCH] drm/amdgpu: add SOS FW version checking for CAP Zhigang Luo
2020-03-24 21:30 ` Liu, Shaoyun
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.