Skip to contentSkip to conversation

drm/amd/pp: Export load_firmware interface

PATCH In review Rex Zhu 1 participant 2 messages Sep 27, 2018 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH v2 1/1 drm/amd/pp: Export load_firmware interface

Export this interface for the AMDGPU_FW_LOAD_SMU type. gfx/sdma can request smu to load firmware.

Split the smu7/8_start_smu function into two functions
1. start_smu, used for load smu firmware in smu7/8 and check smu firmware version.
2. request_smu_load_fw, used for load other ip's firmware on smu7/8 and add firmware loading staus check.

v2: default fw loading type is via smu for VI, driver call smu
to load all fw at the begin of hw init.

---
 drivers/gpu/drm/amd/amdgpu/vi.c                    | 16 ++++++
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      | 20 ++++----
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c |  4 +-
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  | 25 ++++-----
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    |  4 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 59 +++++-----------------
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h |  3 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 46 ++++++++---------
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c    | 12 ++++-
 .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c    |  4 +-
 10 files changed, 86 insertions(+), 107 deletions(-)
drivers/gpu/drm/amd/amdgpu/vi.c +16 -0
index 88b57a5..3384a15 100644
@@ -1222,6 +1222,16 @@ static int vi_common_hw_init(void *handle)
 	/* enable the doorbell aperture */
 	vi_enable_doorbell_aperture(adev, true);
 
+	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) {
+		if (adev->powerplay.pp_funcs->load_firmware) {
+			amdgpu_ucode_init_bo(adev);
+			if (adev->powerplay.pp_funcs->load_firmware(adev->powerplay.pp_handle)) {
+				adev->firmware.load_type = AMDGPU_FW_LOAD_DIRECT;
+				amdgpu_ucode_fini_bo(adev);
+			}
+		}
+	}
+
 	return 0;
 }
 
@@ -1235,6 +1245,12 @@ static int vi_common_hw_fini(void *handle)
 	if (amdgpu_sriov_vf(adev))
 		xgpu_vi_mailbox_put_irq(adev);
 
+	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) {
+		release_firmware(adev->pm.fw);
+		adev->pm.fw = NULL;
+		amdgpu_ucode_fini_bo(adev);
+	}
+
 	return 0;
 }
 
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +10 -10
index aff7c14..5dc8fb9 100644
@@ -109,12 +109,6 @@ static int pp_sw_fini(void *handle)
 
 	hwmgr_sw_fini(hwmgr);
 
-	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) {
-		release_firmware(adev->pm.fw);
-		adev->pm.fw = NULL;
-		amdgpu_ucode_fini_bo(adev);
-	}
-
 	return 0;
 }
 
@@ -124,9 +118,6 @@ static int pp_hw_init(void *handle)
 	struct amdgpu_device *adev = handle;
 	struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle;
 
-	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
-		amdgpu_ucode_init_bo(adev);
-
 	ret = hwmgr_hw_init(hwmgr);
 
 	if (ret)
@@ -275,7 +266,16 @@ static int pp_set_clockgating_state(void *handle,
 
 static int pp_dpm_load_fw(void *handle)
 {
-	return 0;
+	struct pp_hwmgr *hwmgr = handle;
+	int ret = 0;
+
+	if (!hwmgr || !hwmgr->smumgr_funcs)
+		return -EINVAL;
+
+	if (hwmgr->smumgr_funcs->request_smu_load_fw)
+		ret = hwmgr->smumgr_funcs->request_smu_load_fw(hwmgr);
+
+	return ret;
 }
 
 static int pp_dpm_fw_loading_complete(void *handle)
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1 -3
index b6b62a7..ffd7d78 100644
@@ -310,8 +310,6 @@ static int fiji_start_smu(struct pp_hwmgr *hwmgr)
 			offsetof(SMU73_Firmware_Header, SoftRegisters),
 			&(priv->smu7_data.soft_regs_start), 0x40000);
 
-	result = smu7_request_smu_load_fw(hwmgr);
-
 	return result;
 }
 
@@ -2643,7 +2641,7 @@ static int fiji_update_dpm_settings(struct pp_hwmgr *hwmgr,
 	.smu_fini = &smu7_smu_fini,
 	.start_smu = &fiji_start_smu,
 	.check_fw_load_finish = &smu7_check_fw_load_finish,
-	.request_smu_load_fw = &smu7_reload_firmware,
+	.request_smu_load_fw = &smu7_request_smu_load_fw,
 	.request_smu_load_specific_fw = NULL,
 	.send_msg_to_smc = &smu7_send_msg_to_smc,
 	.send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +11 -14
index 73aa368..68a4836 100644
@@ -232,27 +232,24 @@ static int iceland_request_smu_load_specific_fw(struct pp_hwmgr *hwmgr,
 
 static int iceland_start_smu(struct pp_hwmgr *hwmgr)
 {
-	int result;
-
-	result = iceland_smu_upload_firmware_image(hwmgr);
-	if (result)
-		return result;
-	result = iceland_smu_start_smc(hwmgr);
-	if (result)
-		return result;
+	struct iceland_smumgr *priv = hwmgr->smu_backend;
+	int result = 0;
 
 	if (!smu7_is_smc_ram_running(hwmgr)) {
-		pr_info("smu not running, upload firmware again \n");
 		result = iceland_smu_upload_firmware_image(hwmgr);
 		if (result)
 			return result;
 
-		result = iceland_smu_start_smc(hwmgr);
-		if (result)
-			return result;
+		iceland_smu_start_smc(hwmgr);
 	}
+	/* Setup SoftRegsStart here for register lookup in case
+	 * DummyBackEnd is used and ProcessFirmwareHeader is not executed
+	 */
 
-	result = smu7_request_smu_load_fw(hwmgr);
+	smu7_read_smc_sram_dword(hwmgr,
+			SMU71_FIRMWARE_HEADER_LOCATION +
+			offsetof(SMU71_Firmware_Header, SoftRegisters),
+			&(priv->smu7_data.soft_regs_start), 0x40000);
 
 	return result;
 }
@@ -2662,7 +2659,7 @@ static bool iceland_is_dpm_running(struct pp_hwmgr *hwmgr)
 	.smu_fini = &smu7_smu_fini,
 	.start_smu = &iceland_start_smu,
 	.check_fw_load_finish = &smu7_check_fw_load_finish,
-	.request_smu_load_fw = &smu7_reload_firmware,
+	.request_smu_load_fw = &smu7_request_smu_load_fw,
 	.request_smu_load_specific_fw = &iceland_request_smu_load_specific_fw,
 	.send_msg_to_smc = &smu7_send_msg_to_smc,
 	.send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1 -3
index 872d382..2ad6ad9 100644
@@ -313,8 +313,6 @@ static int polaris10_start_smu(struct pp_hwmgr *hwmgr)
 	smu7_read_smc_sram_dword(hwmgr, SMU7_FIRMWARE_HEADER_LOCATION + offsetof(SMU74_Firmware_Header, SoftRegisters),
 					&(smu_data->smu7_data.soft_regs_start), 0x40000);
 
-	result = smu7_request_smu_load_fw(hwmgr);
-
 	return result;
 }
 
@@ -2478,7 +2476,7 @@ static int polaris10_update_dpm_settings(struct pp_hwmgr *hwmgr,
 	.smu_fini = smu7_smu_fini,
 	.start_smu = polaris10_start_smu,
 	.check_fw_load_finish = smu7_check_fw_load_finish,
-	.request_smu_load_fw = smu7_reload_firmware,
+	.request_smu_load_fw = smu7_request_smu_load_fw,
 	.request_smu_load_specific_fw = NULL,
 	.send_msg_to_smc = smu7_send_msg_to_smc,
 	.send_msg_to_smc_with_parameter = smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +12 -47

92 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h +1 -2
index 01f0538f..10c8ceb 100644
@@ -73,9 +73,8 @@ int smu7_read_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr,
 int smu7_write_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr,
 						uint32_t value, uint32_t limit);
 
-int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr);
 int smu7_check_fw_load_finish(struct pp_hwmgr *hwmgr, uint32_t fw_type);
-int smu7_reload_firmware(struct pp_hwmgr *hwmgr);
+int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr);
 int smu7_upload_smu_firmware_image(struct pp_hwmgr *hwmgr);
 int smu7_init(struct pp_hwmgr *hwmgr);
 int smu7_smu_fini(struct pp_hwmgr *hwmgr);
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +23 -23

78 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +10 -2
index ae8378e..d8f1ca2 100644
@@ -192,7 +192,8 @@ static int tonga_start_in_non_protection_mode(struct pp_hwmgr *hwmgr)
 
 static int tonga_start_smu(struct pp_hwmgr *hwmgr)
 {
-	int result;
+	struct tonga_smumgr *priv = hwmgr->smu_backend;
+	int result = 0;
 
 	/* Only start SMC if SMC RAM is not running */
 	if (!smu7_is_smc_ram_running(hwmgr) && hwmgr->not_vf) {
@@ -209,7 +210,14 @@ static int tonga_start_smu(struct pp_hwmgr *hwmgr)
 		}
 	}
 
-	result = smu7_request_smu_load_fw(hwmgr);
+	/* Setup SoftRegsStart here for register lookup in case
+	 * DummyBackEnd is used and ProcessFirmwareHeader is not executed
+	 */
+
+	smu7_read_smc_sram_dword(hwmgr,
+			SMU72_FIRMWARE_HEADER_LOCATION +
+			offsetof(SMU72_Firmware_Header, SoftRegisters),
+			&(priv->smu7_data.soft_regs_start), 0x40000);
 
 	return result;
 }
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +1 -3
index 3d415fa..71e376f 100644
@@ -218,8 +218,6 @@ static int vegam_start_smu(struct pp_hwmgr *hwmgr)
 			&(smu_data->smu7_data.soft_regs_start),
 			0x40000);
 
-	result = smu7_request_smu_load_fw(hwmgr);
-
 	return result;
 }
 
@@ -2280,7 +2278,7 @@ static int vegam_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)
 	.smu_fini = smu7_smu_fini,
 	.start_smu = vegam_start_smu,
 	.check_fw_load_finish = smu7_check_fw_load_finish,
-	.request_smu_load_fw = smu7_reload_firmware,
+	.request_smu_load_fw = smu7_request_smu_load_fw,
 	.request_smu_load_specific_fw = NULL,
 	.send_msg_to_smc = smu7_send_msg_to_smc,
 	.send_msg_to_smc_with_parameter = smu7_send_msg_to_smc_with_parameter,
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1538056543-23070-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

Sorry, Please ignore this patch.

Best Regards

Rex

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Thursday, September 27, 2018 9:55 PM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH v2] drm/amd/pp: Export load_firmware interface

Export this interface for the AMDGPU_FW_LOAD_SMU type. gfx/sdma can request smu to load firmware.

Split the smu7/8_start_smu function into two functions
1. start_smu, used for load smu firmware in smu7/8 and check smu firmware version.
2. request_smu_load_fw, used for load other ip's firmware on smu7/8 and add firmware loading staus check.

v2: default fw loading type is via smu for VI, driver call smu
to load all fw at the begin of hw init.

---
 drivers/gpu/drm/amd/amdgpu/vi.c                    | 16 ++++++
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      | 20 ++++----
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c |  4 +-
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  | 25 ++++-----
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    |  4 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 59 +++++-----------------
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h |  3 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 46 ++++++++---------
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c    | 12 ++++-
 .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c    |  4 +-
 10 files changed, 86 insertions(+), 107 deletions(-)
drivers/gpu/drm/amd/amdgpu/vi.c +16 -0
index 88b57a5..3384a15 100644
@@ -1222,6 +1222,16 @@ static int vi_common_hw_init(void *handle)
         /* enable the doorbell aperture */
         vi_enable_doorbell_aperture(adev, true);
 
+       if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) {
+               if (adev->powerplay.pp_funcs->load_firmware) {
+                       amdgpu_ucode_init_bo(adev);
+                       if (adev->powerplay.pp_funcs->load_firmware(adev->powerplay.pp_handle)) {
+                               adev->firmware.load_type = AMDGPU_FW_LOAD_DIRECT;
+                               amdgpu_ucode_fini_bo(adev);
+                       }
+               }
+       }
+
         return 0;
 }
 
@@ -1235,6 +1245,12 @@ static int vi_common_hw_fini(void *handle)
         if (amdgpu_sriov_vf(adev))
                 xgpu_vi_mailbox_put_irq(adev);
 
+       if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) {
+               release_firmware(adev->pm.fw);
+               adev->pm.fw = NULL;
+               amdgpu_ucode_fini_bo(adev);
+       }
+
         return 0;
 }
 
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +10 -10
index aff7c14..5dc8fb9 100644
@@ -109,12 +109,6 @@ static int pp_sw_fini(void *handle)
 
         hwmgr_sw_fini(hwmgr);
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) {
-               release_firmware(adev->pm.fw);
-               adev->pm.fw = NULL;
-               amdgpu_ucode_fini_bo(adev);
-       }
-
         return 0;
 }
 
@@ -124,9 +118,6 @@ static int pp_hw_init(void *handle)
         struct amdgpu_device *adev = handle;
         struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
-               amdgpu_ucode_init_bo(adev);
-
         ret = hwmgr_hw_init(hwmgr);
 
         if (ret)
@@ -275,7 +266,16 @@ static int pp_set_clockgating_state(void *handle,
 
 static int pp_dpm_load_fw(void *handle)
 {
-       return 0;
+       struct pp_hwmgr *hwmgr = handle;
+       int ret = 0;
+
+       if (!hwmgr || !hwmgr->smumgr_funcs)
+               return -EINVAL;
+
+       if (hwmgr->smumgr_funcs->request_smu_load_fw)
+               ret = hwmgr->smumgr_funcs->request_smu_load_fw(hwmgr);
+
+       return ret;
 }
 
 static int pp_dpm_fw_loading_complete(void *handle)
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1 -3
index b6b62a7..ffd7d78 100644
@@ -310,8 +310,6 @@ static int fiji_start_smu(struct pp_hwmgr *hwmgr)
                         offsetof(SMU73_Firmware_Header, SoftRegisters),
                         &(priv->smu7_data.soft_regs_start), 0x40000);
 
-       result = smu7_request_smu_load_fw(hwmgr);
-
         return result;
 }
 
@@ -2643,7 +2641,7 @@ static int fiji_update_dpm_settings(struct pp_hwmgr *hwmgr,
         .smu_fini = &smu7_smu_fini,
         .start_smu = &fiji_start_smu,
         .check_fw_load_finish = &smu7_check_fw_load_finish,
-       .request_smu_load_fw = &smu7_reload_firmware,
+       .request_smu_load_fw = &smu7_request_smu_load_fw,
         .request_smu_load_specific_fw = NULL,
         .send_msg_to_smc = &smu7_send_msg_to_smc,
         .send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +11 -14
index 73aa368..68a4836 100644
@@ -232,27 +232,24 @@ static int iceland_request_smu_load_specific_fw(struct pp_hwmgr *hwmgr,
 
 static int iceland_start_smu(struct pp_hwmgr *hwmgr)
 {
-       int result;
-
-       result = iceland_smu_upload_firmware_image(hwmgr);
-       if (result)
-               return result;
-       result = iceland_smu_start_smc(hwmgr);
-       if (result)
-               return result;
+       struct iceland_smumgr *priv = hwmgr->smu_backend;
+       int result = 0;
 
         if (!smu7_is_smc_ram_running(hwmgr)) {
-               pr_info("smu not running, upload firmware again \n");
                 result = iceland_smu_upload_firmware_image(hwmgr);
                 if (result)
                         return result;
 
-               result = iceland_smu_start_smc(hwmgr);
-               if (result)
-                       return result;
+               iceland_smu_start_smc(hwmgr);
         }
+       /* Setup SoftRegsStart here for register lookup in case
+        * DummyBackEnd is used and ProcessFirmwareHeader is not executed
+        */
 
-       result = smu7_request_smu_load_fw(hwmgr);
+       smu7_read_smc_sram_dword(hwmgr,
+                       SMU71_FIRMWARE_HEADER_LOCATION +
+                       offsetof(SMU71_Firmware_Header, SoftRegisters),
+                       &(priv->smu7_data.soft_regs_start), 0x40000);
 
         return result;
 }
@@ -2662,7 +2659,7 @@ static bool iceland_is_dpm_running(struct pp_hwmgr *hwmgr)
         .smu_fini = &smu7_smu_fini,
         .start_smu = &iceland_start_smu,
         .check_fw_load_finish = &smu7_check_fw_load_finish,
-       .request_smu_load_fw = &smu7_reload_firmware,
+       .request_smu_load_fw = &smu7_request_smu_load_fw,
         .request_smu_load_specific_fw = &iceland_request_smu_load_specific_fw,
         .send_msg_to_smc = &smu7_send_msg_to_smc,
         .send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1 -3
index 872d382..2ad6ad9 100644
@@ -313,8 +313,6 @@ static int polaris10_start_smu(struct pp_hwmgr *hwmgr)
         smu7_read_smc_sram_dword(hwmgr, SMU7_FIRMWARE_HEADER_LOCATION + offsetof(SMU74_Firmware_Header, SoftRegisters),
                                         &(smu_data->smu7_data.soft_regs_start), 0x40000);
 
-       result = smu7_request_smu_load_fw(hwmgr);
-
         return result;
 }
 
@@ -2478,7 +2476,7 @@ static int polaris10_update_dpm_settings(struct pp_hwmgr *hwmgr,
         .smu_fini = smu7_smu_fini,
         .start_smu = polaris10_start_smu,
         .check_fw_load_finish = smu7_check_fw_load_finish,
-       .request_smu_load_fw = smu7_reload_firmware,
+       .request_smu_load_fw = smu7_request_smu_load_fw,
         .request_smu_load_specific_fw = NULL,
         .send_msg_to_smc = smu7_send_msg_to_smc,
         .send_msg_to_smc_with_parameter = smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +12 -47

92 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h +1 -2
index 01f0538f..10c8ceb 100644
@@ -73,9 +73,8 @@ int smu7_read_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr,
 int smu7_write_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr,
                                                 uint32_t value, uint32_t limit);
 
-int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr);
 int smu7_check_fw_load_finish(struct pp_hwmgr *hwmgr, uint32_t fw_type);
-int smu7_reload_firmware(struct pp_hwmgr *hwmgr);
+int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr);
 int smu7_upload_smu_firmware_image(struct pp_hwmgr *hwmgr);
 int smu7_init(struct pp_hwmgr *hwmgr);
 int smu7_smu_fini(struct pp_hwmgr *hwmgr);
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +23 -23

78 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +10 -2
index ae8378e..d8f1ca2 100644
@@ -192,7 +192,8 @@ static int tonga_start_in_non_protection_mode(struct pp_hwmgr *hwmgr)
 
 static int tonga_start_smu(struct pp_hwmgr *hwmgr)
 {
-       int result;
+       struct tonga_smumgr *priv = hwmgr->smu_backend;
+       int result = 0;
 
         /* Only start SMC if SMC RAM is not running */
         if (!smu7_is_smc_ram_running(hwmgr) && hwmgr->not_vf) {
@@ -209,7 +210,14 @@ static int tonga_start_smu(struct pp_hwmgr *hwmgr)
                 }
         }
 
-       result = smu7_request_smu_load_fw(hwmgr);
+       /* Setup SoftRegsStart here for register lookup in case
+        * DummyBackEnd is used and ProcessFirmwareHeader is not executed
+        */
+
+       smu7_read_smc_sram_dword(hwmgr,
+                       SMU72_FIRMWARE_HEADER_LOCATION +
+                       offsetof(SMU72_Firmware_Header, SoftRegisters),
+                       &(priv->smu7_data.soft_regs_start), 0x40000);
 
         return result;
 }
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +1 -3
index 3d415fa..71e376f 100644
@@ -218,8 +218,6 @@ static int vegam_start_smu(struct pp_hwmgr *hwmgr)
                         &(smu_data->smu7_data.soft_regs_start),
                         0x40000);
 
-       result = smu7_request_smu_load_fw(hwmgr);
-
         return result;
 }
 
@@ -2280,7 +2278,7 @@ static int vegam_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)
         .smu_fini = smu7_smu_fini,
         .start_smu = vegam_start_smu,
         .check_fw_load_finish = smu7_check_fw_load_finish,
-       .request_smu_load_fw = smu7_reload_firmware,
+       .request_smu_load_fw = smu7_request_smu_load_fw,
         .request_smu_load_specific_fw = NULL,
         .send_msg_to_smc = smu7_send_msg_to_smc,
         .send_msg_to_smc_with_parameter = smu7_send_msg_to_smc_with_parameter,

--
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives.. Using amd-gfx: To post a message to all the list members, send email to [email protected] You can subscribe to the list, or change your existing subscription, in the sections below.

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx