From: Hawking Zhang <Hawking.Zhang@amd.com>
Date: Mon, 26 May 2025 07:49:42 +0000 (+0800)
Subject: drm/amdgpu: Remove redundant pmfw backdoor loading
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e0187aec67a9f71e5b3726c1979e1d68db552ca;p=thirdparty%2Fkernel%2Flinux.git

drm/amdgpu: Remove redundant pmfw backdoor loading

PMFW is integrated into ifwi for gfx 12_1 adapter,
making PMFW backdoor loading unnecessary.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
index 51173d551671f..447395d36a3eb 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
@@ -2559,21 +2559,6 @@ static int gfx_v12_1_hw_init(struct amdgpu_ip_block *ip_block)
 	if (r)
 		return r;
 
-	if ((adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT ||
-	     adev->firmware.load_type == AMDGPU_FW_LOAD_RLC_BACKDOOR_AUTO) &&
-	     (amdgpu_dpm == 1)) {
-		/**
-		 * For gfx 12, rlc firmware loading relies on smu firmware is
-		 * loaded firstly, so in direct type, it has to load smc ucode
-		 * here before rlc.
-		 */
-		if (!(adev->flags & AMD_IS_APU)) {
-			r = amdgpu_pm_load_smu_firmware(adev, NULL);
-			if (r)
-				return r;
-		}
-	}
-
 	gfx_v12_1_init_golden_registers(adev);
 
 	gfx_v12_1_constants_init(adev);