Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
On Wed, Feb 27, 2019 at 10:13 PM likun Gao <likun.gao@xxxxxxx> wrote:
>
> From: Likun Gao <Likun.Gao@xxxxxxx>
>
> Move pp_feature from the struct of amd_powerplay to amdgpu_device.
> Add pp_feature limit for overdrive interface.
>
> v2: put pp_feature into struct amdgpu_pm.
> v3: merge feature_mask with pp_feature.
>
> Signed-off-by: Likun Gao <Likun.Gao@xxxxxxx>
> Reviewed-by: Kevin Wang <kevin1.wang@xxxxxxx>
> Suggested-by: Alex Deucher <alexander.deucher@xxxxxxx>
> Suggested-by: Huang Rui <ray.huang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 -
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 3 +++
> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 6 ++++--
> drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
> drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +-
> drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 +++
> drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 +
> 10 files changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index d1c02fa..b8330a2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -706,7 +706,6 @@ enum amd_hw_ip_block_type {
> struct amd_powerplay {
> void *pp_handle;
> const struct amd_pm_funcs *pp_funcs;
> - uint32_t pp_feature;
> };
>
> #define AMDGPU_RESET_MAGIC_NUM 64
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index fcab1fe..a9a45b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1506,7 +1506,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
> return -EAGAIN;
> }
>
> - adev->powerplay.pp_feature = amdgpu_pp_feature_mask;
> + adev->pm.pp_feature = amdgpu_pp_feature_mask;
>
> for (i = 0; i < adev->num_ip_blocks; i++) {
> if ((amdgpu_ip_block_mask & (1 << i)) == 0) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
> index 2fda77f..dca3540 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
> @@ -445,6 +445,9 @@ struct amdgpu_pm {
> uint32_t smu_prv_buffer_size;
> struct amdgpu_bo *smu_prv_buffer;
> bool ac_power;
> + /* powerplay feature */
> + uint32_t pp_feature;
> +
> };
>
> #define R600_SSTU_DFLT 0
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index 97a60da..997932e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -390,7 +390,7 @@ void amdgpu_gfx_compute_mqd_sw_fini(struct amdgpu_device *adev)
>
> void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)
> {
> - if (!(adev->powerplay.pp_feature & PP_GFXOFF_MASK))
> + if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))
> return;
>
> if (!adev->powerplay.pp_funcs || !adev->powerplay.pp_funcs->set_powergating_by_smu)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> index d3efba8..286d9e3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> @@ -2557,7 +2557,8 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
> "pp_power_profile_mode\n");
> return ret;
> }
> - if (is_support_sw_smu(adev) || hwmgr->od_enabled) {
> + if ((is_support_sw_smu(adev) && adev->smu.od_enabled) ||
> + (!is_support_sw_smu(adev) && hwmgr->od_enabled)) {
> ret = device_create_file(adev->dev,
> &dev_attr_pp_od_clk_voltage);
> if (ret) {
> @@ -2633,7 +2634,8 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev)
> device_remove_file(adev->dev, &dev_attr_pp_mclk_od);
> device_remove_file(adev->dev,
> &dev_attr_pp_power_profile_mode);
> - if (hwmgr->od_enabled)
> + if ((is_support_sw_smu(adev) && adev->smu.od_enabled) ||
> + (!is_support_sw_smu(adev) && hwmgr->od_enabled))
> device_remove_file(adev->dev,
> &dev_attr_pp_od_clk_voltage);
> device_remove_file(adev->dev, &dev_attr_gpu_busy_percent);
> diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
> index 0c9a2c0..f2e6b14 100644
> --- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
> @@ -2824,7 +2824,7 @@ static int kv_dpm_init(struct amdgpu_device *adev)
> pi->caps_tcp_ramping = true;
> }
>
> - if (adev->powerplay.pp_feature & PP_SCLK_DEEP_SLEEP_MASK)
> + if (adev->pm.pp_feature & PP_SCLK_DEEP_SLEEP_MASK)
> pi->caps_sclk_ds = true;
> else
> pi->caps_sclk_ds = false;
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 9f6ce6e..e172114 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -933,7 +933,7 @@ static int soc15_common_early_init(void *handle)
> adev->pg_flags = AMD_PG_SUPPORT_SDMA | AMD_PG_SUPPORT_VCN;
> }
>
> - if (adev->powerplay.pp_feature & PP_GFXOFF_MASK)
> + if (adev->pm.pp_feature & PP_GFXOFF_MASK)
> adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
> AMD_PG_SUPPORT_CP |
> AMD_PG_SUPPORT_RLC_SMU_HS;
> diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> index 3f73f7c..a66917d 100644
> --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> @@ -53,7 +53,7 @@ static int amd_powerplay_create(struct amdgpu_device *adev)
> mutex_init(&hwmgr->smu_lock);
> hwmgr->chip_family = adev->family;
> hwmgr->chip_id = adev->asic_type;
> - hwmgr->feature_mask = adev->powerplay.pp_feature;
> + hwmgr->feature_mask = adev->pm.pp_feature;
> hwmgr->display_config = &adev->pm.pm_display_cfg;
> adev->powerplay.pp_handle = hwmgr;
> adev->powerplay.pp_funcs = &pp_dpm_funcs;
> diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> index 9cb45fe..2caf97e 100644
> --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> @@ -290,6 +290,9 @@ static int smu_set_funcs(struct amdgpu_device *adev)
>
> switch (adev->asic_type) {
> case CHIP_VEGA20:
> + adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
> + if (adev->pm.pp_feature & PP_OVERDRIVE_MASK)
> + smu->od_enabled = true;
> smu_v11_0_set_smu_funcs(smu);
> break;
> default:
> diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> index 00ef6f1..ec8b529 100644
> --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> @@ -384,6 +384,7 @@ struct smu_context
> uint32_t pstate_sclk;
> uint32_t pstate_mclk;
>
> + bool od_enabled;
> uint32_t power_limit;
> uint32_t default_power_limit;
>
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
