drm/amd/pm: disable/enable gfx ulv on UMD pstate enter/exit
Subsystems (3)
PATCH 1/5 drm/amd/pm: disable/enable gfx ulv on UMD pstate enter/exit
Add gfx ulv disablement/enablement on UMD pstate entering/exiting.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 1 + 3 files changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -0
@@ -596,6 +596,7 @@ struct pptable_funcs {int (*set_pp_feature_mask)(struct smu_context *smu,uint64_t new_mask);ssize_t (*get_gpu_metrics)(struct smu_context *smu,void **table);int (*enable_mgpu_fan_boost)(struct smu_context *smu); +int (*gfx_ulv_control)(struct smu_context *smu,bool enablement); }; typedef enum {
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -0
@@ -1440,6 +1440,7 @@ static int smu_enable_umd_pstate(void *handle,amdgpu_device_ip_set_clockgating_state (smu->adev,AMD_IP_BLOCK_TYPE_GFX ,AMD_CG_STATE_UNGATE ); +smu_gfx_ulv_control (smu, false); } }else {/* exit umd pstate, restore level, enable gfx cg*/
@@ -1447,6 +1448,7 @@ static int smu_enable_umd_pstate(void *handle,if (*level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT ) *level = smu_dpm_ctx->saved_dpm_level; smu_dpm_ctx->enable_umd_pstate = false; +smu_gfx_ulv_control (smu, true);amdgpu_device_ip_set_clockgating_state (smu->adev,AMD_IP_BLOCK_TYPE_GFX ,AMD_CG_STATE_GATE );
drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +1 -0
@@ -92,6 +92,7 @@#define smu_get_asic_power_limits (smu) smu_ppt_funcs(get_power_limit, 0, smu)#define smu_get_pp_feature_mask (smu, buf) smu_ppt_funcs(get_pp_feature_mask, 0, smu, buf)#define smu_set_pp_feature_mask (smu, new_mask) smu_ppt_funcs(set_pp_feature_mask, 0, smu, new_mask) +#define smu_gfx_ulv_control (smu, enablement) smu_ppt_funcs(gfx_ulv_control, 0, smu, enablement)#endif #endif
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/5 drm/amd/pm: add Navi1x gfx ulv control interface
This is needed for UMD pstate switch.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +12 -0
@@ -2578,6 +2578,17 @@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu) NULL); } +static int navi10_gfx_ulv_control (struct smu_context *smu, +bool enablement) +{ +int ret =0 ; + +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); + +return ret; +} +static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table,
@@ -2660,6 +2671,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = navi10_get_gpu_metrics, .enable_mgpu_fan_boost = navi10_enable_mgpu_fan_boost, + .gfx_ulv_control = navi10_gfx_ulv_control, };void navi10_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amd/pm: add Arcturus gfx ulv control interface
In reply to Evan QuanThis is needed for UMD pstate switch.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +12 -0
@@ -2313,6 +2313,17 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_0 ); } +static int arcturus_gfx_ulv_control (struct smu_context *smu, +bool enablement) +{ +int ret =0 ; + +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); + +return ret; +} +static const struct pptable_funcs arcturus_ppt_funcs = {/* init dpm */ .get_allowed_feature_mask = arcturus_get_allowed_feature_mask,
@@ -2391,6 +2402,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = arcturus_get_gpu_metrics, + .gfx_ulv_control = arcturus_gfx_ulv_control, };void arcturus_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amd/pm: add Sienna Cichlid gfx ulv control interface
In reply to Evan QuanThis is needed for UMD pstate switch.
--- .../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +12 -0
@@ -2718,6 +2718,17 @@ static int sienna_cichlid_enable_mgpu_fan_boost(struct smu_context *smu) NULL); } +static int sienna_cichlid_gfx_ulv_control (struct smu_context *smu, +bool enablement) +{ +int ret =0 ; + +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); + +return ret; +} +static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .get_allowed_feature_mask = sienna_cichlid_get_allowed_feature_mask, .set_default_dpm_table = sienna_cichlid_set_default_dpm_table,
@@ -2796,6 +2807,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = sienna_cichlid_get_gpu_metrics, .enable_mgpu_fan_boost = sienna_cichlid_enable_mgpu_fan_boost, + .gfx_ulv_control = sienna_cichlid_gfx_ulv_control, };void sienna_cichlid_set_ppt_funcs (struct smu_context *smu)
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 drm/amd/pm: widely share the logic for gfx ulv control
In reply to Evan QuanConsidering the same logic can be applied to Arcturus, Navi1X and Sienna Cichlid.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 3 +++ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 13 +------------ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 13 +------------ .../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 13 +------------ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 11 +++++++++++ 5 files changed, 17 insertions(+), 36 deletions(-)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +3 -0
@@ -274,5 +274,8 @@ int smu_v11_0_get_current_pcie_link_speed(struct smu_context *smu);void smu_v11_0_init_gpu_metrics_v1_0 (struct gpu_metrics_v1_0 *gpu_metrics); +int smu_v11_0_gfx_ulv_control (struct smu_context *smu, +bool enablement); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -12
@@ -2313,17 +2313,6 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_0 ); } -static int arcturus_gfx_ulv_control (struct smu_context *smu, -bool enablement) -{ -int ret =0 ; - -if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) - ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); - -return ret; -} -static const struct pptable_funcs arcturus_ppt_funcs = {/* init dpm */ .get_allowed_feature_mask = arcturus_get_allowed_feature_mask,
@@ -2402,7 +2391,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = arcturus_get_gpu_metrics, - .gfx_ulv_control = arcturus_gfx_ulv_control, + .gfx_ulv_control = smu_v11_0_gfx_ulv_control, };void arcturus_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -12
@@ -2578,17 +2578,6 @@ static int navi10_enable_mgpu_fan_boost(struct smu_context *smu) NULL); } -static int navi10_gfx_ulv_control (struct smu_context *smu, -bool enablement) -{ -int ret =0 ; - -if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) - ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); - -return ret; -} -static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table,
@@ -2671,7 +2660,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = navi10_get_gpu_metrics, .enable_mgpu_fan_boost = navi10_enable_mgpu_fan_boost, - .gfx_ulv_control = navi10_gfx_ulv_control, + .gfx_ulv_control = smu_v11_0_gfx_ulv_control, };void navi10_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -12
@@ -2718,17 +2718,6 @@ static int sienna_cichlid_enable_mgpu_fan_boost(struct smu_context *smu) NULL); } -static int sienna_cichlid_gfx_ulv_control (struct smu_context *smu, -bool enablement) -{ -int ret =0 ; - -if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) - ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); - -return ret; -} -static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .get_allowed_feature_mask = sienna_cichlid_get_allowed_feature_mask, .set_default_dpm_table = sienna_cichlid_set_default_dpm_table,
@@ -2807,7 +2796,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, .get_gpu_metrics = sienna_cichlid_get_gpu_metrics, .enable_mgpu_fan_boost = sienna_cichlid_enable_mgpu_fan_boost, - .gfx_ulv_control = sienna_cichlid_gfx_ulv_control, + .gfx_ulv_control = smu_v11_0_gfx_ulv_control, };void sienna_cichlid_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +11 -0
@@ -1985,3 +1985,14 @@ void smu_v11_0_init_gpu_metrics_v1_0(struct gpu_metrics_v1_0 *gpu_metrics) gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); } + +int smu_v11_0_gfx_ulv_control (struct smu_context *smu, +bool enablement) +{ +int ret =0 ; + +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_GFX_ULV_BIT )) + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_GFX_ULV_BIT , enablement); + +return ret; +}
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
You can probably just squash patches 2-5 into one patch. Either way, series is:
________________________________
From: Quan, Evan <[email protected]>
Sent: Monday, August 17, 2020 3:49 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/5] drm/amd/pm: disable/enable gfx ulv on UMD pstate enter/exit
Add gfx ulv disablement/enablement on UMD pstate entering/exiting.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 1 + 3 files changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -0
@@ -596,6 +596,7 @@ struct pptable_funcs {int (*set_pp_feature_mask)(struct smu_context *smu,uint64_t new_mask);ssize_t (*get_gpu_metrics)(struct smu_context *smu,void **table);int (*enable_mgpu_fan_boost)(struct smu_context *smu); +int (*gfx_ulv_control)(struct smu_context *smu,bool enablement); }; typedef enum {
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -0
@@ -1440,6 +1440,7 @@ static int smu_enable_umd_pstate(void *handle,amdgpu_device_ip_set_clockgating_state (smu->adev,AMD_IP_BLOCK_TYPE_GFX ,AMD_CG_STATE_UNGATE ); +smu_gfx_ulv_control (smu, false); } }else {/* exit umd pstate, restore level, enable gfx cg*/
@@ -1447,6 +1448,7 @@ static int smu_enable_umd_pstate(void *handle,if (*level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT ) *level = smu_dpm_ctx->saved_dpm_level; smu_dpm_ctx->enable_umd_pstate = false; +smu_gfx_ulv_control (smu, true);amdgpu_device_ip_set_clockgating_state (smu->adev,AMD_IP_BLOCK_TYPE_GFX ,AMD_CG_STATE_GATE );
drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +1 -0
@@ -92,6 +92,7 @@#define smu_get_asic_power_limits (smu) smu_ppt_funcs(get_power_limit, 0, smu)#define smu_get_pp_feature_mask (smu, buf) smu_ppt_funcs(get_pp_feature_mask, 0, smu, buf)#define smu_set_pp_feature_mask (smu, new_mask) smu_ppt_funcs(set_pp_feature_mask, 0, smu, new_mask) +#define smu_gfx_ulv_control (smu, enablement) smu_ppt_funcs(gfx_ulv_control, 0, smu, enablement)#endif #endif
--
2.28.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx