amd-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/amd/pm: revise two names of sensor values for vangogh
@ 2021-04-14  7:25 Xiaojian Du
  2021-04-15  8:18 ` Huang Rui
  0 siblings, 1 reply; 2+ messages in thread
From: Xiaojian Du @ 2021-04-14  7:25 UTC (permalink / raw)
  To: amd-gfx; +Cc: Lijo.Lazar, kevin1.wang, ray.huang, Xiaojian Du, evan.quan

This patch is to revise two names of  sensor values for vangogh.
New smu metrics table is supported by new pmfw
(from version 4.63.36.00 ), it includes two parts, one part is
the current smu metrics table data and the other part is the
average smu metrics table data. The hwmon will read the current gfxclk
and mclk from the current smu metrics table data.

Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index 35904315c1f9..77f532a49e37 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -270,7 +270,7 @@ static int vangogh_get_legacy_smu_metrics_data(struct smu_context *smu,
 	}
 
 	switch (member) {
-	case METRICS_AVERAGE_GFXCLK:
+	case METRICS_CURR_GFXCLK:
 		*value = metrics->GfxclkFrequency;
 		break;
 	case METRICS_AVERAGE_SOCCLK:
@@ -282,7 +282,7 @@ static int vangogh_get_legacy_smu_metrics_data(struct smu_context *smu,
 	case METRICS_AVERAGE_DCLK:
 		*value = metrics->DclkFrequency;
 		break;
-	case METRICS_AVERAGE_UCLK:
+	case METRICS_CURR_UCLK:
 		*value = metrics->MemclkFrequency;
 		break;
 	case METRICS_AVERAGE_GFXACTIVITY:
@@ -345,7 +345,7 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu,
 	}
 
 	switch (member) {
-	case METRICS_AVERAGE_GFXCLK:
+	case METRICS_CURR_GFXCLK:
 		*value = metrics->Current.GfxclkFrequency;
 		break;
 	case METRICS_AVERAGE_SOCCLK:
@@ -357,7 +357,7 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu,
 	case METRICS_AVERAGE_DCLK:
 		*value = metrics->Current.DclkFrequency;
 		break;
-	case METRICS_AVERAGE_UCLK:
+	case METRICS_CURR_UCLK:
 		*value = metrics->Current.MemclkFrequency;
 		break;
 	case METRICS_AVERAGE_GFXACTIVITY:
@@ -1529,14 +1529,14 @@ static int vangogh_read_sensor(struct smu_context *smu,
 		break;
 	case AMDGPU_PP_SENSOR_GFX_MCLK:
 		ret = vangogh_common_get_smu_metrics_data(smu,
-						   METRICS_AVERAGE_UCLK,
+						   METRICS_CURR_UCLK,
 						   (uint32_t *)data);
 		*(uint32_t *)data *= 100;
 		*size = 4;
 		break;
 	case AMDGPU_PP_SENSOR_GFX_SCLK:
 		ret = vangogh_common_get_smu_metrics_data(smu,
-						   METRICS_AVERAGE_GFXCLK,
+						   METRICS_CURR_GFXCLK,
 						   (uint32_t *)data);
 		*(uint32_t *)data *= 100;
 		*size = 4;
-- 
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amd/pm: revise two names of sensor values for vangogh
  2021-04-14  7:25 [PATCH] drm/amd/pm: revise two names of sensor values for vangogh Xiaojian Du
@ 2021-04-15  8:18 ` Huang Rui
  0 siblings, 0 replies; 2+ messages in thread
From: Huang Rui @ 2021-04-15  8:18 UTC (permalink / raw)
  To: Du, Xiaojian; +Cc: Lazar, Lijo, Wang, Kevin(Yang), Quan, Evan, amd-gfx

On Wed, Apr 14, 2021 at 03:25:55PM +0800, Du, Xiaojian wrote:
> This patch is to revise two names of  sensor values for vangogh.
> New smu metrics table is supported by new pmfw
> (from version 4.63.36.00 ), it includes two parts, one part is
> the current smu metrics table data and the other part is the
> average smu metrics table data. The hwmon will read the current gfxclk
> and mclk from the current smu metrics table data.
> 
> Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com>

Reviewed-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> index 35904315c1f9..77f532a49e37 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> @@ -270,7 +270,7 @@ static int vangogh_get_legacy_smu_metrics_data(struct smu_context *smu,
>  	}
>  
>  	switch (member) {
> -	case METRICS_AVERAGE_GFXCLK:
> +	case METRICS_CURR_GFXCLK:
>  		*value = metrics->GfxclkFrequency;
>  		break;
>  	case METRICS_AVERAGE_SOCCLK:
> @@ -282,7 +282,7 @@ static int vangogh_get_legacy_smu_metrics_data(struct smu_context *smu,
>  	case METRICS_AVERAGE_DCLK:
>  		*value = metrics->DclkFrequency;
>  		break;
> -	case METRICS_AVERAGE_UCLK:
> +	case METRICS_CURR_UCLK:
>  		*value = metrics->MemclkFrequency;
>  		break;
>  	case METRICS_AVERAGE_GFXACTIVITY:
> @@ -345,7 +345,7 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu,
>  	}
>  
>  	switch (member) {
> -	case METRICS_AVERAGE_GFXCLK:
> +	case METRICS_CURR_GFXCLK:
>  		*value = metrics->Current.GfxclkFrequency;
>  		break;
>  	case METRICS_AVERAGE_SOCCLK:
> @@ -357,7 +357,7 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu,
>  	case METRICS_AVERAGE_DCLK:
>  		*value = metrics->Current.DclkFrequency;
>  		break;
> -	case METRICS_AVERAGE_UCLK:
> +	case METRICS_CURR_UCLK:
>  		*value = metrics->Current.MemclkFrequency;
>  		break;
>  	case METRICS_AVERAGE_GFXACTIVITY:
> @@ -1529,14 +1529,14 @@ static int vangogh_read_sensor(struct smu_context *smu,
>  		break;
>  	case AMDGPU_PP_SENSOR_GFX_MCLK:
>  		ret = vangogh_common_get_smu_metrics_data(smu,
> -						   METRICS_AVERAGE_UCLK,
> +						   METRICS_CURR_UCLK,
>  						   (uint32_t *)data);
>  		*(uint32_t *)data *= 100;
>  		*size = 4;
>  		break;
>  	case AMDGPU_PP_SENSOR_GFX_SCLK:
>  		ret = vangogh_common_get_smu_metrics_data(smu,
> -						   METRICS_AVERAGE_GFXCLK,
> +						   METRICS_CURR_GFXCLK,
>  						   (uint32_t *)data);
>  		*(uint32_t *)data *= 100;
>  		*size = 4;
> -- 
> 2.25.1
> 
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-15  8:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14  7:25 [PATCH] drm/amd/pm: revise two names of sensor values for vangogh Xiaojian Du
2021-04-15  8:18 ` Huang Rui

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).