drm/amdgpu/pm: remove check for pp funcs in freq sysfs handlers

Submitted by Alex Deucher on July 17, 2019, 6:15 p.m.

Details

Message ID 20190717181527.6492-1-alexander.deucher@amd.com
State Accepted
Commit 8a5b5d425e5454fdef0e5457826f4aa7f96cf463
Headers show
Series "drm/amdgpu/pm: remove check for pp funcs in freq sysfs handlers" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Alex Deucher July 17, 2019, 6:15 p.m.
The dpm sensor function already does this for us.  This fixes
the freq*_input files with the new SMU implementation.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 10 ----------
 1 file changed, 10 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 397af9094a39..8b7efd0a7028 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -2077,11 +2077,6 @@  static ssize_t amdgpu_hwmon_show_sclk(struct device *dev,
 	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
 		return -EINVAL;
 
-	/* sanity check PP is enabled */
-	if (!(adev->powerplay.pp_funcs &&
-	      adev->powerplay.pp_funcs->read_sensor))
-	      return -EINVAL;
-
 	/* get the sclk */
 	r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GFX_SCLK,
 				   (void *)&sclk, &size);
@@ -2112,11 +2107,6 @@  static ssize_t amdgpu_hwmon_show_mclk(struct device *dev,
 	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
 		return -EINVAL;
 
-	/* sanity check PP is enabled */
-	if (!(adev->powerplay.pp_funcs &&
-	      adev->powerplay.pp_funcs->read_sensor))
-	      return -EINVAL;
-
 	/* get the sclk */
 	r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GFX_MCLK,
 				   (void *)&mclk, &size);

Comments

Reviewed-by: Evan Quan <evan.quan@amd.com>


> -----Original Message-----

> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex

> Deucher

> Sent: Thursday, July 18, 2019 2:15 AM

> To: amd-gfx@lists.freedesktop.org

> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>

> Subject: [PATCH] drm/amdgpu/pm: remove check for pp funcs in freq sysfs

> handlers

> 

> The dpm sensor function already does this for us.  This fixes the freq*_input

> files with the new SMU implementation.

> 

> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

> ---

>  drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 10 ----------

>  1 file changed, 10 deletions(-)

> 

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

> b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

> index 397af9094a39..8b7efd0a7028 100644

> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

> @@ -2077,11 +2077,6 @@ static ssize_t amdgpu_hwmon_show_sclk(struct

> device *dev,

>  	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))

>  		return -EINVAL;

> 

> -	/* sanity check PP is enabled */

> -	if (!(adev->powerplay.pp_funcs &&

> -	      adev->powerplay.pp_funcs->read_sensor))

> -	      return -EINVAL;

> -

>  	/* get the sclk */

>  	r = amdgpu_dpm_read_sensor(adev,

> AMDGPU_PP_SENSOR_GFX_SCLK,

>  				   (void *)&sclk, &size);

> @@ -2112,11 +2107,6 @@ static ssize_t amdgpu_hwmon_show_mclk(struct

> device *dev,

>  	     (ddev->switch_power_state != DRM_SWITCH_POWER_ON))

>  		return -EINVAL;

> 

> -	/* sanity check PP is enabled */

> -	if (!(adev->powerplay.pp_funcs &&

> -	      adev->powerplay.pp_funcs->read_sensor))

> -	      return -EINVAL;

> -

>  	/* get the sclk */

>  	r = amdgpu_dpm_read_sensor(adev,

> AMDGPU_PP_SENSOR_GFX_MCLK,

>  				   (void *)&mclk, &size);

> --

> 2.20.1

> 

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx