]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/pm: skip loading pptable from driver on secure board for smu_v13_0_10
authorKenneth Feng <kenneth.feng@amd.com>
Mon, 26 Sep 2022 09:15:04 +0000 (17:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Nov 2022 17:17:25 +0000 (18:17 +0100)
[ Upstream commit f700486cd1f2bf381671d1c2c7dc9000db10c50e ]

skip loading pptable from driver on secure board since it's loaded from psp.

Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Reviewed-by: Guan Yu <Guan.Yu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

index 93f9b8377539a4c618da67770495f9febe55a5b4..750d8da84fac4224184583215281bf977138fa06 100644 (file)
@@ -210,7 +210,8 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu)
                return 0;
 
        if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7)) ||
-           (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0)))
+           (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0)) ||
+           (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 10)))
                return 0;
 
        /* override pptable_id from driver parameter */