Commit e09a4fdf authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Rename amdgpu_hwmon_get_sensor_generic 



Rename amdgpu_hwmon_get_sensor_generic to use for generic pm
interfaces

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarYang Wang <kevinyang.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1a4dd33c

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+39 −37
Original line number Diff line number Diff line
@@ -1421,7 +1421,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, 
	return -EINVAL;

}



static int amdgpu_hwmon_get_sensor_generic(struct amdgpu_device *adev,

static int amdgpu_pm_get_sensor_generic(struct amdgpu_device *adev,

					enum amd_pp_sensors sensor,

					void *query)

{
@@ -1456,7 +1456,7 @@ static ssize_t amdgpu_get_gpu_busy_percent(struct device *dev, 
	unsigned int value;

	int r;



	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_LOAD, &value);

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_LOAD, &value);

	if (r)

		return r;
@@ -1480,7 +1480,7 @@ static ssize_t amdgpu_get_mem_busy_percent(struct device *dev, 
	unsigned int value;

	int r;



	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_LOAD, &value);

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_LOAD, &value);

	if (r)

		return r;
@@ -1504,7 +1504,7 @@ static ssize_t amdgpu_get_vcn_busy_percent(struct device *dev, 
	unsigned int value;

	int r;



	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VCN_LOAD, &value);

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VCN_LOAD, &value);

	if (r)

		return r;
@@ -1783,7 +1783,7 @@ static int amdgpu_show_powershift_percent(struct device *dev, 
	uint32_t ss_power;

	int r = 0, i;



	r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&ss_power);

	r = amdgpu_pm_get_sensor_generic(adev, sensor, (void *)&ss_power);

	if (r == -EOPNOTSUPP) {

		/* sensor not available on dGPU, try to read from APU */

		adev = NULL;
@@ -1796,7 +1796,7 @@ static int amdgpu_show_powershift_percent(struct device *dev, 
		}

		mutex_unlock(&mgpu_info.mutex);

		if (adev)

			r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&ss_power);

			r = amdgpu_pm_get_sensor_generic(adev, sensor, (void *)&ss_power);

	}



	if (r)
@@ -1906,10 +1906,10 @@ static int ss_bias_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ 


	if (!amdgpu_device_supports_smart_shift(adev))

		*states = ATTR_STATE_UNSUPPORTED;

	else if (amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_APU_SHARE,

	else if (amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_APU_SHARE,

					      (void *)&ss_power))

		*states = ATTR_STATE_UNSUPPORTED;

	else if (amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_DGPU_SHARE,

	else if (amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_DGPU_SHARE,

					      (void *)&ss_power))

		*states = ATTR_STATE_UNSUPPORTED;
@@ -2636,17 +2636,17 @@ static ssize_t amdgpu_hwmon_show_temp(struct device *dev, 
	switch (channel) {

	case PP_TEMP_JUNCTION:

		/* get current junction temperature */

		r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_HOTSPOT_TEMP,

		r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_HOTSPOT_TEMP,

						 (void *)&temp);

		break;

	case PP_TEMP_EDGE:

		/* get current edge temperature */

		r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_EDGE_TEMP,

		r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_EDGE_TEMP,

						 (void *)&temp);

		break;

	case PP_TEMP_MEM:

		/* get current memory temperature */

		r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_TEMP,

		r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_TEMP,

						 (void *)&temp);

		break;

	default:
@@ -2909,7 +2909,7 @@ static ssize_t amdgpu_hwmon_get_fan1_min(struct device *dev, 
	u32 min_rpm = 0;

	int r;



	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MIN_FAN_RPM,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MIN_FAN_RPM,

					 (void *)&min_rpm);



	if (r)
@@ -2926,7 +2926,7 @@ static ssize_t amdgpu_hwmon_get_fan1_max(struct device *dev, 
	u32 max_rpm = 0;

	int r;



	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MAX_FAN_RPM,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MAX_FAN_RPM,

					 (void *)&max_rpm);



	if (r)
@@ -3060,7 +3060,7 @@ static ssize_t amdgpu_hwmon_show_vddgfx(struct device *dev, 
	int r;



	/* get the voltage */

	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDGFX,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDGFX,

					 (void *)&vddgfx);

	if (r)

		return r;
@@ -3077,7 +3077,7 @@ static ssize_t amdgpu_hwmon_show_vddboard(struct device *dev, 
	int r;



	/* get the voltage */

	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,

					 (void *)&vddboard);

	if (r)

		return r;
@@ -3111,7 +3111,7 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev, 
		return -EINVAL;



	/* get the voltage */

	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDNB,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDNB,

					 (void *)&vddnb);

	if (r)

		return r;
@@ -3134,7 +3134,7 @@ static int amdgpu_hwmon_get_power(struct device *dev, 
	u32 query = 0;

	int r;



	r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&query);

	r = amdgpu_pm_get_sensor_generic(adev, sensor, (void *)&query);

	if (r)

		return r;
@@ -3284,7 +3284,7 @@ static ssize_t amdgpu_hwmon_show_sclk(struct device *dev, 
	int r;



	/* get the sclk */

	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_SCLK,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_SCLK,

					 (void *)&sclk);

	if (r)

		return r;
@@ -3308,7 +3308,7 @@ static ssize_t amdgpu_hwmon_show_mclk(struct device *dev, 
	int r;



	/* get the sclk */

	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_MCLK,

	r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_MCLK,

					 (void *)&mclk);

	if (r)

		return r;
@@ -3607,10 +3607,12 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 


	/* not all products support both average and instantaneous */

	if (attr == &sensor_dev_attr_power1_average.dev_attr.attr &&

	    amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER, (void *)&tmp) == -EOPNOTSUPP)

	    amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER,

					 (void *)&tmp) == -EOPNOTSUPP)

		return 0;

	if (attr == &sensor_dev_attr_power1_input.dev_attr.attr &&

	    amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_INPUT_POWER, (void *)&tmp) == -EOPNOTSUPP)

	    amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_INPUT_POWER,

					 (void *)&tmp) == -EOPNOTSUPP)

		return 0;



	/* hide max/min values if we can't both query and manage the fan */
@@ -3649,7 +3651,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	/* only few boards support vddboard */

	if ((attr == &sensor_dev_attr_in2_input.dev_attr.attr ||

	     attr == &sensor_dev_attr_in2_label.dev_attr.attr) &&

	     amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,

	     amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,

					  (void *)&tmp) == -EOPNOTSUPP)

		return 0;