drm/amd/powerplay: add an new mask to ctrl clock stretch feature.
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: add an new mask to ctrl clock stretch feature.
Change-Id: I80ff8618d314429430ba3db49da83c66da14af29
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1 -1
@@ -1428,7 +1428,7 @@ static void smu7_init_dpm_defaults(struct pp_hwmgr *hwmgr)phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_ControlVDDCI); -if ((hwmgr->pp_table_version !=PP_TABLE_V0 ) +if ((hwmgr->pp_table_version !=PP_TABLE_V0 ) && (hwmgr->feature_mask &PP_CLOCK_STRETCH_MASK ) && (table_info->cac_dtp_table->usClockStretchAmount !=0 ))phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_ClockStretcher);
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +2 -1
@@ -85,7 +85,8 @@ enum PP_FEATURE_MASK {PP_SMC_VOLTAGE_CONTROL_MASK =0x40 ,PP_VBI_TIME_SUPPORT_MASK =0x80 ,PP_ULV_MASK =0x100 , -PP_ENABLE_GFX_CG_THRU_SMU =0x200 +PP_ENABLE_GFX_CG_THRU_SMU =0x200 , + PP_CLOCK_STRETCH_MASK = 0x400, }; enum PHM_BackEnd_Magic {
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/powerplay: make CAC feature controlled by powertune.
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +7 -13
@@ -692,13 +692,17 @@ int hwmgr_set_user_specify_caps(struct pp_hwmgr *hwmgr)phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep); -if (amdgpu_powercontainment) +if (amdgpu_powercontainment) {phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PowerContainment); -else +phm_cap_set (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_CAC); + }else {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PowerContainment); - +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_CAC); + } hwmgr->feature_mask = amdgpu_pp_feature_mask;return 0 ;
@@ -734,9 +738,6 @@ int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr) PHM_PlatformCaps_TCPRamping);phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_CAC); - -phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_RegulatorHot); phm_cap_set(hwmgr->platform_descriptor.platformCaps,
@@ -765,8 +766,6 @@ int fiji_set_asic_special_caps(struct pp_hwmgr *hwmgr)phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_TablelessHardwareInterface); -phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_CAC);return 0 ; }
@@ -789,9 +788,6 @@ int tonga_set_asic_special_caps(struct pp_hwmgr *hwmgr)phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_TablelessHardwareInterface); -phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_CAC); -return 0 ; }
@@ -808,8 +804,6 @@ int topaz_set_asic_special_caps(struct pp_hwmgr *hwmgr)phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_TablelessHardwareInterface);phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_CAC); -phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_EVV);return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Thursday, October 27, 2016 5:59 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 1/2] drm/amd/powerplay: add an new mask to ctrl clock stretch feature.
Quoted 3 lines
Signed-off-by Rex Zhu <[email protected]>Change-Id: I80ff8618d314429430ba3db49da83c66da14af29
For the series:
Quoted 40 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1@@ -1428,7 +1428,7 @@ static void smu7_init_dpm_defaults(struct pp_hwmgr *hwmgr) phm_cap_unset(hwmgr->platform_descriptor.platformCaps,PHM_PlatformCaps_ControlVDDCI ); -if ((hwmgr->pp_table_version !=PP_TABLE_V0 ) + if ((hwmgr->pp_table_version != PP_TABLE_V0) && (hwmgr- >feature_mask & PP_CLOCK_STRETCH_MASK) && (table_info->cac_dtp_table->usClockStretchAmount !=0))
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-0phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_ClockStretcher);drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +2
-2@@ -85,7 +85,8 @@ enum PP_FEATURE_MASK {PP_SMC_VOLTAGE_CONTROL_MASK =0x40 ,PP_VBI_TIME_SUPPORT_MASK =0x80 ,PP_ULV_MASK =0x100 , -PP_ENABLE_GFX_CG_THRU_SMU =0x200 +PP_ENABLE_GFX_CG_THRU_SMU =0x200 , + PP_CLOCK_STRETCH_MASK = 0x400, }; enum PHM_BackEnd_Magic { --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx