Skip to content

Commit e09a4fd

Browse files
Asad Kamalalexdeucher
Asad Kamal
authored and
alexdeucher
committed
drm/amd/pm: Rename amdgpu_hwmon_get_sensor_generic
Rename amdgpu_hwmon_get_sensor_generic to use for generic pm interfaces Signed-off-by: Asad Kamal <asad.kamal@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Reviewed-by: Yang Wang <kevinyang.wang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 1a4dd33 commit e09a4fd

1 file changed

Lines changed: 39 additions & 37 deletions

File tree

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

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,9 +1421,9 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,
14211421
return -EINVAL;
14221422
}
14231423

1424-
static int amdgpu_hwmon_get_sensor_generic(struct amdgpu_device *adev,
1425-
enum amd_pp_sensors sensor,
1426-
void *query)
1424+
static int amdgpu_pm_get_sensor_generic(struct amdgpu_device *adev,
1425+
enum amd_pp_sensors sensor,
1426+
void *query)
14271427
{
14281428
int r, size = sizeof(uint32_t);
14291429

@@ -1456,7 +1456,7 @@ static ssize_t amdgpu_get_gpu_busy_percent(struct device *dev,
14561456
unsigned int value;
14571457
int r;
14581458

1459-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_LOAD, &value);
1459+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_LOAD, &value);
14601460
if (r)
14611461
return r;
14621462

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

1483-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_LOAD, &value);
1483+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_LOAD, &value);
14841484
if (r)
14851485
return r;
14861486

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

1507-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VCN_LOAD, &value);
1507+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VCN_LOAD, &value);
15081508
if (r)
15091509
return r;
15101510

@@ -1783,7 +1783,7 @@ static int amdgpu_show_powershift_percent(struct device *dev,
17831783
uint32_t ss_power;
17841784
int r = 0, i;
17851785

1786-
r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&ss_power);
1786+
r = amdgpu_pm_get_sensor_generic(adev, sensor, (void *)&ss_power);
17871787
if (r == -EOPNOTSUPP) {
17881788
/* sensor not available on dGPU, try to read from APU */
17891789
adev = NULL;
@@ -1796,7 +1796,7 @@ static int amdgpu_show_powershift_percent(struct device *dev,
17961796
}
17971797
mutex_unlock(&mgpu_info.mutex);
17981798
if (adev)
1799-
r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&ss_power);
1799+
r = amdgpu_pm_get_sensor_generic(adev, sensor, (void *)&ss_power);
18001800
}
18011801

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

19071907
if (!amdgpu_device_supports_smart_shift(adev))
19081908
*states = ATTR_STATE_UNSUPPORTED;
1909-
else if (amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_APU_SHARE,
1910-
(void *)&ss_power))
1909+
else if (amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_APU_SHARE,
1910+
(void *)&ss_power))
19111911
*states = ATTR_STATE_UNSUPPORTED;
1912-
else if (amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_DGPU_SHARE,
1913-
(void *)&ss_power))
1912+
else if (amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_SS_DGPU_SHARE,
1913+
(void *)&ss_power))
19141914
*states = ATTR_STATE_UNSUPPORTED;
19151915

19161916
return 0;
@@ -2636,18 +2636,18 @@ static ssize_t amdgpu_hwmon_show_temp(struct device *dev,
26362636
switch (channel) {
26372637
case PP_TEMP_JUNCTION:
26382638
/* get current junction temperature */
2639-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_HOTSPOT_TEMP,
2640-
(void *)&temp);
2639+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_HOTSPOT_TEMP,
2640+
(void *)&temp);
26412641
break;
26422642
case PP_TEMP_EDGE:
26432643
/* get current edge temperature */
2644-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_EDGE_TEMP,
2645-
(void *)&temp);
2644+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_EDGE_TEMP,
2645+
(void *)&temp);
26462646
break;
26472647
case PP_TEMP_MEM:
26482648
/* get current memory temperature */
2649-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_TEMP,
2650-
(void *)&temp);
2649+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MEM_TEMP,
2650+
(void *)&temp);
26512651
break;
26522652
default:
26532653
r = -EINVAL;
@@ -2909,8 +2909,8 @@ static ssize_t amdgpu_hwmon_get_fan1_min(struct device *dev,
29092909
u32 min_rpm = 0;
29102910
int r;
29112911

2912-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MIN_FAN_RPM,
2913-
(void *)&min_rpm);
2912+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MIN_FAN_RPM,
2913+
(void *)&min_rpm);
29142914

29152915
if (r)
29162916
return r;
@@ -2926,8 +2926,8 @@ static ssize_t amdgpu_hwmon_get_fan1_max(struct device *dev,
29262926
u32 max_rpm = 0;
29272927
int r;
29282928

2929-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MAX_FAN_RPM,
2930-
(void *)&max_rpm);
2929+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_MAX_FAN_RPM,
2930+
(void *)&max_rpm);
29312931

29322932
if (r)
29332933
return r;
@@ -3060,8 +3060,8 @@ static ssize_t amdgpu_hwmon_show_vddgfx(struct device *dev,
30603060
int r;
30613061

30623062
/* get the voltage */
3063-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDGFX,
3064-
(void *)&vddgfx);
3063+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDGFX,
3064+
(void *)&vddgfx);
30653065
if (r)
30663066
return r;
30673067

@@ -3077,8 +3077,8 @@ static ssize_t amdgpu_hwmon_show_vddboard(struct device *dev,
30773077
int r;
30783078

30793079
/* get the voltage */
3080-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,
3081-
(void *)&vddboard);
3080+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,
3081+
(void *)&vddboard);
30823082
if (r)
30833083
return r;
30843084

@@ -3111,8 +3111,8 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,
31113111
return -EINVAL;
31123112

31133113
/* get the voltage */
3114-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDNB,
3115-
(void *)&vddnb);
3114+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDNB,
3115+
(void *)&vddnb);
31163116
if (r)
31173117
return r;
31183118

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

3137-
r = amdgpu_hwmon_get_sensor_generic(adev, sensor, (void *)&query);
3137+
r = amdgpu_pm_get_sensor_generic(adev, sensor, (void *)&query);
31383138
if (r)
31393139
return r;
31403140

@@ -3284,8 +3284,8 @@ static ssize_t amdgpu_hwmon_show_sclk(struct device *dev,
32843284
int r;
32853285

32863286
/* get the sclk */
3287-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_SCLK,
3288-
(void *)&sclk);
3287+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_SCLK,
3288+
(void *)&sclk);
32893289
if (r)
32903290
return r;
32913291

@@ -3308,8 +3308,8 @@ static ssize_t amdgpu_hwmon_show_mclk(struct device *dev,
33083308
int r;
33093309

33103310
/* get the sclk */
3311-
r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_MCLK,
3312-
(void *)&mclk);
3311+
r = amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GFX_MCLK,
3312+
(void *)&mclk);
33133313
if (r)
33143314
return r;
33153315

@@ -3607,10 +3607,12 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,
36073607

36083608
/* not all products support both average and instantaneous */
36093609
if (attr == &sensor_dev_attr_power1_average.dev_attr.attr &&
3610-
amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER, (void *)&tmp) == -EOPNOTSUPP)
3610+
amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER,
3611+
(void *)&tmp) == -EOPNOTSUPP)
36113612
return 0;
36123613
if (attr == &sensor_dev_attr_power1_input.dev_attr.attr &&
3613-
amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_INPUT_POWER, (void *)&tmp) == -EOPNOTSUPP)
3614+
amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_INPUT_POWER,
3615+
(void *)&tmp) == -EOPNOTSUPP)
36143616
return 0;
36153617

36163618
/* hide max/min values if we can't both query and manage the fan */
@@ -3649,8 +3651,8 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,
36493651
/* only few boards support vddboard */
36503652
if ((attr == &sensor_dev_attr_in2_input.dev_attr.attr ||
36513653
attr == &sensor_dev_attr_in2_label.dev_attr.attr) &&
3652-
amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,
3653-
(void *)&tmp) == -EOPNOTSUPP)
3654+
amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,
3655+
(void *)&tmp) == -EOPNOTSUPP)
36543656
return 0;
36553657

36563658
/* no mclk on APUs other than gc 9,4,3*/

0 commit comments

Comments
 (0)