Revert "drm/amd/pm: fix workload mismatch on vega10"
Subsystems (3)
Kenneth Feng
maintainerPATCH 1/2 Revert "drm/amd/pm: fix workload mismatch on vega10"
This reverts commit 0979d43259e13846d86ba17e451e17fec185d240. Revert this because it does not apply to all the cards.
--- drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1 -1
@@ -5164,7 +5164,7 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui out:smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetWorkloadMask, - (!power_profile_mode) ?0 :1 << (power_profile_mode -1 ), +1 << power_profile_mode,NULL ); hwmgr->power_profile_mode = power_profile_mode;
Signature · 1 line
2.17.1
Kenneth Feng
maintainerPATCH 2/2 drm/amd/pm: change the workload type for some cards
change the workload type for some cards as it is needed.
--- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +14 -1
@@ -5127,6 +5127,13 @@ static int vega10_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)return size; } +static bool vega10_get_power_profile_mode_quirks (struct pp_hwmgr *hwmgr) +{ +struct amdgpu_device *adev = hwmgr->adev; + +return (adev->pdev->device ==0x6860 ); +} +static int vega10_set_power_profile_mode (struct pp_hwmgr *hwmgr,long *input,uint32_t size) {struct vega10_hwmgr *data = hwmgr->backend;
@@ -5163,9 +5170,15 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui } out: -smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetWorkloadMask, +if (vega10_get_power_profile_mode_quirks (hwmgr)) +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetWorkloadMask,1 << power_profile_mode,NULL ); +else +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetWorkloadMask, + (!power_profile_mode) ?0 :1 << (power_profile_mode -1 ), +NULL ); + hwmgr->power_profile_mode = power_profile_mode;return 0 ;
Signature · 1 line
2.17.1
RE: [PATCH 2/2] drm/amd/pm: change the workload type for some cards
[AMD Official Use Only]
Series is
Regards,
Hawking
-----Original Message-----
From: Kenneth Feng <[email protected]>
Sent: Friday, August 13, 2021 16:48
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Feng, Kenneth <[email protected]>
Subject: [PATCH 2/2] drm/amd/pm: change the workload type for some cards
change the workload type for some cards as it is needed.
--- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +6 -0
@@ -5127,6 +5127,13 @@ static int vega10_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)return size; } +static bool vega10_get_power_profile_mode_quirks (struct pp_hwmgr +*hwmgr) { +struct amdgpu_device *adev = hwmgr->adev; + +return (adev->pdev->device ==0x6860 ); } +static int vega10_set_power_profile_mode (struct pp_hwmgr *hwmgr,long *input,uint32_t size) { struct vega10_hwmgr *data = hwmgr->backend; @@ -5163,9 +5170,15 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui }
out:
- smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask,
+ if (vega10_get_power_profile_mode_quirks(hwmgr))
+ smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask,
1 << power_profile_mode, NULL);
+ else
+ smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask,
+ (!power_profile_mode) ? 0 : 1 << (power_profile_mode - 1),
+ NULL);
+
hwmgr->power_profile_mode = power_profile_mode;
return 0;
--
2.17.1