[04/26] drm/amd/powerplay: implement power1_cap and power1_cap_max interface for SMU11.

Submitted by Huang, Ray on Feb. 25, 2019, 12:12 p.m.

Details

Message ID 1551096752-18205-5-git-send-email-ray.huang@amd.com
State New
Headers show
Series "Updates for SW SMU driver" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Huang, Ray Feb. 25, 2019, 12:12 p.m.
From: Chengming Gui <Jack.Gui@amd.com>

add get_power_limit and set_power_limit functions
to support hwmon for SMU11.

Signed-off-by: Chengming Gui <Jack.Gui@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c         | 15 ++++++++--
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c     |  2 +-
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h |  9 ++++--
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c      | 41 +++++++++++++++++++-------
 4 files changed, 49 insertions(+), 18 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index d140b3d..92d0fb3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -1761,7 +1761,11 @@  static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,
 	struct amdgpu_device *adev = dev_get_drvdata(dev);
 	uint32_t limit = 0;
 
-	if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
+	if (is_support_sw_smu(adev)) {
+		smu_get_power_limit(&adev->smu, &limit, true);
+		return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
+	}
+	else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
 		adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, true);
 		return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
 	} else {
@@ -1776,7 +1780,10 @@  static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,
 	struct amdgpu_device *adev = dev_get_drvdata(dev);
 	uint32_t limit = 0;
 
-	if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
+	if (is_support_sw_smu(adev)) {
+		smu_get_power_limit(&adev->smu, &limit, false);
+		return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
+	} else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
 		adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, false);
 		return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
 	} else {
@@ -1799,7 +1806,9 @@  static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,
 		return err;
 
 	value = value / 1000000; /* convert to Watt */
-	if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_power_limit) {
+	if (is_support_sw_smu(adev))
+		adev->smu.funcs->set_power_limit(&adev->smu, value);
+	else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_power_limit) {
 		err = adev->powerplay.pp_funcs->set_power_limit(adev->powerplay.pp_handle, value);
 		if (err)
 			return err;
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index ed2f7cc..ed2d199 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -619,7 +619,7 @@  static int smu_smc_table_hw_init(struct smu_context *smu)
 	if (ret)
 		return ret;
 
-	ret = smu_get_power_limit(smu);
+	ret = smu_get_power_limit(smu, &smu->default_power_limit, false);
 	if (ret)
 		return ret;
 
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 2cc7129..d49bdee 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -484,7 +484,8 @@  struct smu_funcs
 	int (*disable_all_mask)(struct smu_context *smu);
 	int (*update_feature_enable_state)(struct smu_context *smu, uint32_t feature_id, bool enabled);
 	int (*notify_display_change)(struct smu_context *smu);
-	int (*get_power_limit)(struct smu_context *smu);
+	int (*get_power_limit)(struct smu_context *smu, uint32_t *limit, bool def);
+	int (*set_power_limit)(struct smu_context *smu, uint32_t n);
 	int (*get_current_clk_freq)(struct smu_context *smu, uint32_t clk_id, uint32_t *value);
 	int (*init_max_sustainable_clocks)(struct smu_context *smu);
 	int (*start_thermal_control)(struct smu_context *smu);
@@ -619,8 +620,10 @@  struct smu_funcs
 	((smu)->ppt_funcs->set_default_od8_settings ? (smu)->ppt_funcs->set_default_od8_settings((smu)) : 0)
 #define smu_update_specified_od8_value(smu, index, value) \
 	((smu)->ppt_funcs->update_specified_od8_value ? (smu)->ppt_funcs->update_specified_od8_value((smu), (index), (value)) : 0)
-#define smu_get_power_limit(smu) \
-	((smu)->funcs->get_power_limit? (smu)->funcs->get_power_limit((smu)) : 0)
+#define smu_get_power_limit(smu, limit, def) \
+	((smu)->funcs->get_power_limit ? (smu)->funcs->get_power_limit((smu), (limit), (def)) : 0)
+#define smu_set_power_limit(smu, limit) \
+	((smu)->funcs->set_power_limit ? (smu)->funcs->set_power_limit((smu), (limit)) : 0)
 #define smu_get_current_clk_freq(smu, clk_id, value) \
 	((smu)->funcs->get_current_clk_freq? (smu)->funcs->get_current_clk_freq((smu), (clk_id), (value)) : 0)
 #define smu_print_clk_levels(smu, type, buf) \
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 6333c18..7397a63 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -873,23 +873,41 @@  static int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu)
 	return 0;
 }
 
-static int smu_v11_0_get_power_limit(struct smu_context *smu)
+static int smu_v11_0_get_power_limit(struct smu_context *smu,
+				     uint32_t *limit,
+				     bool get_default)
 {
-	int ret;
-	uint32_t power_limit_value;
+	int ret = 0;
 
-	ret = smu_send_smc_msg_with_param(smu,
-			SMU_MSG_GetPptLimit,
-			POWER_SOURCE_AC << 16);
+	if (get_default) {
+		mutex_lock(&smu->mutex);
+		*limit = smu->default_power_limit;
+		mutex_unlock(&smu->mutex);
+	} else {
+			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetPptLimit,
+							  POWER_SOURCE_AC << 16);
+			if (ret) {
+				pr_err("[%s] get PPT limit failed!", __func__);
+				return ret;
+			}
+			smu_read_smc_arg(smu, limit);
+			smu->power_limit = *limit;
+	}
+
+	return ret;
+}
+
+static int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n)
+{
+	int ret = 0;
+		if (smu_feature_is_enabled(smu, FEATURE_PPT_BIT))
+			ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, n);
 	if (ret) {
-		pr_err("[GetPptLimit] get default PPT limit failed!");
+		pr_err("[%s] Set power limit Failed!", __func__);
 		return ret;
 	}
 
-	smu_read_smc_arg(smu, &power_limit_value);
-	smu->power_limit = smu->default_power_limit = power_limit_value;
-
-	return 0;
+	return ret;
 }
 
 static int smu_v11_0_get_current_clk_freq(struct smu_context *smu, uint32_t clk_id, uint32_t *value)
@@ -1760,6 +1778,7 @@  static const struct smu_funcs smu_v11_0_funcs = {
 	.update_feature_enable_state = smu_v11_0_update_feature_enable_state,
 	.notify_display_change = smu_v11_0_notify_display_change,
 	.get_power_limit = smu_v11_0_get_power_limit,
+	.set_power_limit = smu_v11_0_set_power_limit,
 	.get_current_clk_freq = smu_v11_0_get_current_clk_freq,
 	.init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
 	.start_thermal_control = smu_v11_0_start_thermal_control,

Comments

On Mon, Feb 25, 2019 at 7:13 AM Huang Rui <ray.huang@amd.com> wrote:
>
> From: Chengming Gui <Jack.Gui@amd.com>
>
> add get_power_limit and set_power_limit functions
> to support hwmon for SMU11.
>
> Signed-off-by: Chengming Gui <Jack.Gui@amd.com>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
> Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c         | 15 ++++++++--
>  drivers/gpu/drm/amd/powerplay/amdgpu_smu.c     |  2 +-
>  drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h |  9 ++++--
>  drivers/gpu/drm/amd/powerplay/smu_v11_0.c      | 41 +++++++++++++++++++-------
>  4 files changed, 49 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> index d140b3d..92d0fb3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> @@ -1761,7 +1761,11 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,
>         struct amdgpu_device *adev = dev_get_drvdata(dev);
>         uint32_t limit = 0;
>
> -       if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
> +       if (is_support_sw_smu(adev)) {
> +               smu_get_power_limit(&adev->smu, &limit, true);
> +               return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
> +       }
> +       else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {

The } should be on the same line as the else.  e.g.,
} else if (...
With that fixed:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>


Alex

>                 adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, true);
>                 return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
>         } else {
> @@ -1776,7 +1780,10 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,
>         struct amdgpu_device *adev = dev_get_drvdata(dev);
>         uint32_t limit = 0;
>
> -       if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
> +       if (is_support_sw_smu(adev)) {
> +               smu_get_power_limit(&adev->smu, &limit, false);
> +               return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
> +       } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
>                 adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, false);
>                 return snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
>         } else {
> @@ -1799,7 +1806,9 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,
>                 return err;
>
>         value = value / 1000000; /* convert to Watt */
> -       if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_power_limit) {
> +       if (is_support_sw_smu(adev))
> +               adev->smu.funcs->set_power_limit(&adev->smu, value);
> +       else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_power_limit) {
>                 err = adev->powerplay.pp_funcs->set_power_limit(adev->powerplay.pp_handle, value);
>                 if (err)
>                         return err;
> diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> index ed2f7cc..ed2d199 100644
> --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> @@ -619,7 +619,7 @@ static int smu_smc_table_hw_init(struct smu_context *smu)
>         if (ret)
>                 return ret;
>
> -       ret = smu_get_power_limit(smu);
> +       ret = smu_get_power_limit(smu, &smu->default_power_limit, false);
>         if (ret)
>                 return ret;
>
> diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> index 2cc7129..d49bdee 100644
> --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> @@ -484,7 +484,8 @@ struct smu_funcs
>         int (*disable_all_mask)(struct smu_context *smu);
>         int (*update_feature_enable_state)(struct smu_context *smu, uint32_t feature_id, bool enabled);
>         int (*notify_display_change)(struct smu_context *smu);
> -       int (*get_power_limit)(struct smu_context *smu);
> +       int (*get_power_limit)(struct smu_context *smu, uint32_t *limit, bool def);
> +       int (*set_power_limit)(struct smu_context *smu, uint32_t n);
>         int (*get_current_clk_freq)(struct smu_context *smu, uint32_t clk_id, uint32_t *value);
>         int (*init_max_sustainable_clocks)(struct smu_context *smu);
>         int (*start_thermal_control)(struct smu_context *smu);
> @@ -619,8 +620,10 @@ struct smu_funcs
>         ((smu)->ppt_funcs->set_default_od8_settings ? (smu)->ppt_funcs->set_default_od8_settings((smu)) : 0)
>  #define smu_update_specified_od8_value(smu, index, value) \
>         ((smu)->ppt_funcs->update_specified_od8_value ? (smu)->ppt_funcs->update_specified_od8_value((smu), (index), (value)) : 0)
> -#define smu_get_power_limit(smu) \
> -       ((smu)->funcs->get_power_limit? (smu)->funcs->get_power_limit((smu)) : 0)
> +#define smu_get_power_limit(smu, limit, def) \
> +       ((smu)->funcs->get_power_limit ? (smu)->funcs->get_power_limit((smu), (limit), (def)) : 0)
> +#define smu_set_power_limit(smu, limit) \
> +       ((smu)->funcs->set_power_limit ? (smu)->funcs->set_power_limit((smu), (limit)) : 0)
>  #define smu_get_current_clk_freq(smu, clk_id, value) \
>         ((smu)->funcs->get_current_clk_freq? (smu)->funcs->get_current_clk_freq((smu), (clk_id), (value)) : 0)
>  #define smu_print_clk_levels(smu, type, buf) \
> diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> index 6333c18..7397a63 100644
> --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> @@ -873,23 +873,41 @@ static int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu)
>         return 0;
>  }
>
> -static int smu_v11_0_get_power_limit(struct smu_context *smu)
> +static int smu_v11_0_get_power_limit(struct smu_context *smu,
> +                                    uint32_t *limit,
> +                                    bool get_default)
>  {
> -       int ret;
> -       uint32_t power_limit_value;
> +       int ret = 0;
>
> -       ret = smu_send_smc_msg_with_param(smu,
> -                       SMU_MSG_GetPptLimit,
> -                       POWER_SOURCE_AC << 16);
> +       if (get_default) {
> +               mutex_lock(&smu->mutex);
> +               *limit = smu->default_power_limit;
> +               mutex_unlock(&smu->mutex);
> +       } else {
> +                       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetPptLimit,
> +                                                         POWER_SOURCE_AC << 16);
> +                       if (ret) {
> +                               pr_err("[%s] get PPT limit failed!", __func__);
> +                               return ret;
> +                       }
> +                       smu_read_smc_arg(smu, limit);
> +                       smu->power_limit = *limit;
> +       }
> +
> +       return ret;
> +}
> +
> +static int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n)
> +{
> +       int ret = 0;
> +               if (smu_feature_is_enabled(smu, FEATURE_PPT_BIT))
> +                       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, n);
>         if (ret) {
> -               pr_err("[GetPptLimit] get default PPT limit failed!");
> +               pr_err("[%s] Set power limit Failed!", __func__);
>                 return ret;
>         }
>
> -       smu_read_smc_arg(smu, &power_limit_value);
> -       smu->power_limit = smu->default_power_limit = power_limit_value;
> -
> -       return 0;
> +       return ret;
>  }
>
>  static int smu_v11_0_get_current_clk_freq(struct smu_context *smu, uint32_t clk_id, uint32_t *value)
> @@ -1760,6 +1778,7 @@ static const struct smu_funcs smu_v11_0_funcs = {
>         .update_feature_enable_state = smu_v11_0_update_feature_enable_state,
>         .notify_display_change = smu_v11_0_notify_display_change,
>         .get_power_limit = smu_v11_0_get_power_limit,
> +       .set_power_limit = smu_v11_0_set_power_limit,
>         .get_current_clk_freq = smu_v11_0_get_current_clk_freq,
>         .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
>         .start_thermal_control = smu_v11_0_start_thermal_control,
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx