mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
drm/nouveau/nouveau/perfmon: add interface files for current core voltage
Signed-off-by: Karol Herbst <nouveau@karolherbst.de> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
fcc95ce90f
commit
2e7db87dee
2 changed files with 51 additions and 0 deletions
|
@ -63,6 +63,7 @@ u64 nvif_device_time(struct nvif_device *);
|
|||
#define nvxx_clk(a) nvxx_device(a)->clk
|
||||
#define nvxx_i2c(a) nvxx_device(a)->i2c
|
||||
#define nvxx_therm(a) nvxx_device(a)->therm
|
||||
#define nvxx_volt(a) nvxx_device(a)->volt
|
||||
|
||||
#include <core/device.h>
|
||||
#include <engine/fifo.h>
|
||||
|
|
|
@ -34,6 +34,8 @@
|
|||
#include "nouveau_drm.h"
|
||||
#include "nouveau_hwmon.h"
|
||||
|
||||
#include <nvkm/subdev/volt.h>
|
||||
|
||||
#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
|
||||
static ssize_t
|
||||
nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf)
|
||||
|
@ -512,6 +514,35 @@ static SENSOR_DEVICE_ATTR(pwm1_max, S_IRUGO | S_IWUSR,
|
|||
nouveau_hwmon_get_pwm1_max,
|
||||
nouveau_hwmon_set_pwm1_max, 0);
|
||||
|
||||
static ssize_t
|
||||
nouveau_hwmon_get_in0_input(struct device *d,
|
||||
struct device_attribute *a, char *buf)
|
||||
{
|
||||
struct drm_device *dev = dev_get_drvdata(d);
|
||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||
struct nvkm_volt *volt = nvxx_volt(&drm->device);
|
||||
int ret;
|
||||
|
||||
ret = nvkm_volt_get(volt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return sprintf(buf, "%i\n", ret / 1000);
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO,
|
||||
nouveau_hwmon_get_in0_input, NULL, 0);
|
||||
|
||||
static ssize_t
|
||||
nouveau_hwmon_get_in0_label(struct device *d,
|
||||
struct device_attribute *a, char *buf)
|
||||
{
|
||||
return sprintf(buf, "GPU core\n");
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO,
|
||||
nouveau_hwmon_get_in0_label, NULL, 0);
|
||||
|
||||
static struct attribute *hwmon_default_attributes[] = {
|
||||
&sensor_dev_attr_name.dev_attr.attr,
|
||||
&sensor_dev_attr_update_rate.dev_attr.attr,
|
||||
|
@ -542,6 +573,12 @@ static struct attribute *hwmon_pwm_fan_attributes[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static struct attribute *hwmon_in0_attributes[] = {
|
||||
&sensor_dev_attr_in0_input.dev_attr.attr,
|
||||
&sensor_dev_attr_in0_label.dev_attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group hwmon_default_attrgroup = {
|
||||
.attrs = hwmon_default_attributes,
|
||||
};
|
||||
|
@ -554,6 +591,9 @@ static const struct attribute_group hwmon_fan_rpm_attrgroup = {
|
|||
static const struct attribute_group hwmon_pwm_fan_attrgroup = {
|
||||
.attrs = hwmon_pwm_fan_attributes,
|
||||
};
|
||||
static const struct attribute_group hwmon_in0_attrgroup = {
|
||||
.attrs = hwmon_in0_attributes,
|
||||
};
|
||||
#endif
|
||||
|
||||
int
|
||||
|
@ -562,6 +602,7 @@ nouveau_hwmon_init(struct drm_device *dev)
|
|||
#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
|
||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||
struct nvkm_therm *therm = nvxx_therm(&drm->device);
|
||||
struct nvkm_volt *volt = nvxx_volt(&drm->device);
|
||||
struct nouveau_hwmon *hwmon;
|
||||
struct device *hwmon_dev;
|
||||
int ret = 0;
|
||||
|
@ -613,6 +654,14 @@ nouveau_hwmon_init(struct drm_device *dev)
|
|||
goto error;
|
||||
}
|
||||
|
||||
if (volt && nvkm_volt_get(volt) >= 0) {
|
||||
ret = sysfs_create_group(&hwmon_dev->kobj,
|
||||
&hwmon_in0_attrgroup);
|
||||
|
||||
if (ret)
|
||||
goto error;
|
||||
}
|
||||
|
||||
hwmon->hwmon = hwmon_dev;
|
||||
|
||||
return 0;
|
||||
|
@ -638,6 +687,7 @@ nouveau_hwmon_fini(struct drm_device *dev)
|
|||
sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_temp_attrgroup);
|
||||
sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_pwm_fan_attrgroup);
|
||||
sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_fan_rpm_attrgroup);
|
||||
sysfs_remove_group(&hwmon->hwmon->kobj, &hwmon_in0_attrgroup);
|
||||
|
||||
hwmon_device_unregister(hwmon->hwmon);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue