drm/amdgpu/pm: correct the firmware flag address for SMU IP v13.0.4
Subsystems (3)
PATCH 1/2 drm/amdgpu/pm: correct the firmware flag address for SMU IP v13.0.4
For SMU IP v13.0.4, the smnMP1_FIRMWARE_FLAGS address is different, we need this to correct the reading address.
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +1 -0
@@ -43,6 +43,7 @@/* address block */ #define smnMP1_FIRMWARE_FLAGS 0x3010024 +#define smnMP1_V13_0_4_FIRMWARE_FLAGS 0x3010028#define smnMP0_FW_INTF 0x30101c0#define smnMP1_PUB_CTRL 0x3010b14
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +10 -2
@@ -273,8 +273,16 @@ int smu_v13_0_check_fw_status(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags; - mp1_fw_flags =RREG32_PCIE (MP1_Public | - (smnMP1_FIRMWARE_FLAGS &0xffffffff )); +switch (adev->ip_versions[MP1_HWIP ][0 ]) { +case IP_VERSION (13 ,0 ,4 ): + mp1_fw_flags =RREG32_PCIE (MP1_Public | + (smnMP1_V13_0_4_FIRMWARE_FLAGS &0xffffffff )); +break ; +default : + mp1_fw_flags =RREG32_PCIE (MP1_Public | + (smnMP1_FIRMWARE_FLAGS &0xffffffff )); +break ; + }if ((mp1_fw_flags &MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK ) >>MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED__SHIFT )
Signature · 1 line
2.25.1
PATCH 2/2 drm/amdgpu/pm: remove the repeated EnableGfxImu message sending
The EnableGfxImu message will be issued in the set_gfx_power_up_by_imu.
--- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +4 -9
@@ -219,15 +219,10 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en) {struct amdgpu_device *adev = smu->adev;int ret =0 ; -/* SMU fw need this message to trigger IMU to complete the initialization */ -if (en) - ret =smu_cmn_send_smc_msg (smu, SMU_MSG_EnableGfxImu,NULL ); -else { -if (!adev->in_s0ix) - ret =smu_cmn_send_smc_msg (smu, - SMU_MSG_PrepareMp1ForUnload, -NULL ); - } + +if (!en && !adev->in_s0ix) + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL ); +return ret; }
Signature · 1 line
2.25.1
[AMD Official Use Only - General]
This series is :
-----Original Message-----
From: Huang, Tim <[email protected]>
Sent: Thursday, June 9, 2022 1:13 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Zhang, Yifan <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu/pm: correct the firmware flag address for SMU IP v13.0.4
For SMU IP v13.0.4, the smnMP1_FIRMWARE_FLAGS address is different, we need this to correct the reading address.
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +1 -0
@@ -43,6 +43,7 @@/* address block */ #define smnMP1_FIRMWARE_FLAGS 0x3010024 +#define smnMP1_V13_0_4_FIRMWARE_FLAGS 0x3010028#define smnMP0_FW_INTF 0x30101c0#define smnMP1_PUB_CTRL 0x3010b14
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +10 -2
@@ -273,8 +273,16 @@ int smu_v13_0_check_fw_status(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags; - mp1_fw_flags =RREG32_PCIE (MP1_Public | - (smnMP1_FIRMWARE_FLAGS &0xffffffff )); +switch (adev->ip_versions[MP1_HWIP ][0 ]) { +case IP_VERSION (13 ,0 ,4 ): + mp1_fw_flags =RREG32_PCIE (MP1_Public | + (smnMP1_V13_0_4_FIRMWARE_FLAGS &0xffffffff )); +break ; +default : + mp1_fw_flags =RREG32_PCIE (MP1_Public | + (smnMP1_FIRMWARE_FLAGS &0xffffffff )); +break ; + }if ((mp1_fw_flags &MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK ) >>MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED__SHIFT )
--
2.25.1