drm/amdgpu/pm: update smu driver interface header for SMU IP v13.0.4
Subsystems (3)
PATCH 1/2 drm/amdgpu/pm: update smu driver interface header for SMU IP v13.0.4
Update the SmuMetrics_t defination and SMU driver interface version.
--- .../drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h +3 -1
@@ -27,7 +27,7 @@// *** IMPORTANT *** // SMU TEAM: Always increment the interface version if // any structure is changed in this file -#define PMFW_DRIVER_IF_VERSION 4 +#define PMFW_DRIVER_IF_VERSION 5 typedef struct { int32_t value;
@@ -197,6 +197,8 @@ typedef struct {uint16_t SkinTemp;uint16_t DeviceState; +uint16_t CurTemp;//[centi-Celsius] +uint16_t spare2; } SmuMetrics_t; typedef struct {
Signature · 1 line
2.25.1
PATCH 2/2 drm/amdgpu/pm: remove EnableGfxOff message for SMU IP v13.0.4
The EnableGfxOff message is dropped from the new PMFW ppsmc interface.
--- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +0 -14
@@ -71,7 +71,6 @@ static struct cmn2asic_msg_mapping smu_v13_0_4_message_map[SMU_MSG_MAX_COUNT] =MSG_MAP (TestMessage, PPSMC_MSG_TestMessage,1 ),MSG_MAP (GetSmuVersion, PPSMC_MSG_GetPmfwVersion,1 ),MSG_MAP (GetDriverIfVersion, PPSMC_MSG_GetDriverIfVersion,1 ), -MSG_MAP (EnableGfxOff, PPSMC_MSG_EnableGfxOff,1 ),MSG_MAP (AllowGfxOff, PPSMC_MSG_AllowGfxOff,1 ),MSG_MAP (DisallowGfxOff, PPSMC_MSG_DisallowGfxOff,1 ), MSG_MAP(PowerDownVcn, PPSMC_MSG_PowerDownVcn, 1),
@@ -226,18 +225,6 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en)return ret; } -static int smu_v13_0_4_post_smu_init (struct smu_context *smu) -{ -struct amdgpu_device *adev = smu->adev; -int ret =0 ; - -/* allow message will be sent after enable message */ - ret =smu_cmn_send_smc_msg (smu, SMU_MSG_EnableGfxOff,NULL ); -if (ret) -dev_err (adev->dev,"Failed to Enable GfxOff!\n" ); -return ret; -} -static ssize_t smu_v13_0_4_get_gpu_metrics (struct smu_context *smu,void **table) {
@@ -1026,7 +1013,6 @@ static const struct pptable_funcs smu_v13_0_4_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_set_driver_table_location, .gfx_off_control = smu_v13_0_gfx_off_control, - .post_init = smu_v13_0_4_post_smu_init, .mode2_reset = smu_v13_0_4_mode2_reset, .get_dpm_ultimate_freq = smu_v13_0_4_get_dpm_ultimate_freq, .od_edit_dpm_table = smu_v13_0_od_edit_dpm_table,
Signature · 1 line
2.25.1
RE: [PATCH 2/2] drm/amdgpu/pm: remove EnableGfxOff message for SMU IP v13.0.4
[Public]
This series is:
-----Original Message-----
From: Huang, Tim <[email protected]>
Sent: Friday, August 5, 2022 5:44 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Du, Xiaojian <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/pm: remove EnableGfxOff message for SMU IP v13.0.4
The EnableGfxOff message is dropped from the new PMFW ppsmc interface.
--- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +0 -13
@@ -71,7 +71,6 @@ static struct cmn2asic_msg_mapping smu_v13_0_4_message_map[SMU_MSG_MAX_COUNT] =MSG_MAP (TestMessage, PPSMC_MSG_TestMessage,1 ),MSG_MAP (GetSmuVersion, PPSMC_MSG_GetPmfwVersion,1 ),MSG_MAP (GetDriverIfVersion, PPSMC_MSG_GetDriverIfVersion,1 ), -MSG_MAP (EnableGfxOff, PPSMC_MSG_EnableGfxOff,1 ),MSG_MAP (AllowGfxOff, PPSMC_MSG_AllowGfxOff,1 ),MSG_MAP (DisallowGfxOff, PPSMC_MSG_DisallowGfxOff,1 ), MSG_MAP(PowerDownVcn, PPSMC_MSG_PowerDownVcn, 1),
@@ -226,18 +225,6 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en)return ret; } -static int smu_v13_0_4_post_smu_init(struct smu_context *smu) -{ -struct amdgpu_device *adev = smu->adev; -int ret =0 ; - -/* allow message will be sent after enable message */ - ret =smu_cmn_send_smc_msg (smu, SMU_MSG_EnableGfxOff,NULL ); -if (ret) -dev_err (adev->dev,"Failed to Enable GfxOff!\n" ); -return ret; -} -static ssize_t smu_v13_0_4_get_gpu_metrics (struct smu_context *smu,void **table) {
@@ -1026,7 +1013,6 @@ static const struct pptable_funcs smu_v13_0_4_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_set_driver_table_location, .gfx_off_control = smu_v13_0_gfx_off_control, - .post_init = smu_v13_0_4_post_smu_init, .mode2_reset = smu_v13_0_4_mode2_reset, .get_dpm_ultimate_freq = smu_v13_0_4_get_dpm_ultimate_freq, .od_edit_dpm_table = smu_v13_0_od_edit_dpm_table,
--
2.25.1