Commit eb72ed5d authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs

drm/nouveau/hwmon: don't require therm to be valid to get any data

Signed-off-by: default avatarKarol Herbst <nouveau@karolherbst.de>
Reviewed-by: default avatarMartin Peres <martin.peres@free.fr>
parent 353b9834
...@@ -640,9 +640,6 @@ nouveau_hwmon_init(struct drm_device *dev) ...@@ -640,9 +640,6 @@ nouveau_hwmon_init(struct drm_device *dev)
return -ENOMEM; return -ENOMEM;
hwmon->dev = dev; hwmon->dev = dev;
if (!therm || !therm->attr_get || !therm->attr_set)
return -ENODEV;
hwmon_dev = hwmon_device_register(&dev->pdev->dev); hwmon_dev = hwmon_device_register(&dev->pdev->dev);
if (IS_ERR(hwmon_dev)) { if (IS_ERR(hwmon_dev)) {
ret = PTR_ERR(hwmon_dev); ret = PTR_ERR(hwmon_dev);
...@@ -656,26 +653,28 @@ nouveau_hwmon_init(struct drm_device *dev) ...@@ -656,26 +653,28 @@ nouveau_hwmon_init(struct drm_device *dev)
if (ret) if (ret)
goto error; goto error;
/* if the card has a working thermal sensor */ if (therm && therm->attr_get && therm->attr_set) {
if (nvkm_therm_temp_get(therm) >= 0) { /* if the card has a working thermal sensor */
ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_temp_attrgroup); if (nvkm_therm_temp_get(therm) >= 0) {
if (ret) ret = sysfs_create_group(&hwmon_dev->kobj, &hwmon_temp_attrgroup);
goto error; if (ret)
} goto error;
}
/* if the card has a pwm fan */
/*XXX: incorrect, need better detection for this, some boards have /* if the card has a pwm fan */
* the gpio entries for pwm fan control even when there's no /*XXX: incorrect, need better detection for this, some boards have
* actual fan connected to it... therm table? */ * the gpio entries for pwm fan control even when there's no
if (therm->fan_get && therm->fan_get(therm) >= 0) { * actual fan connected to it... therm table? */
ret = sysfs_create_group(&hwmon_dev->kobj, if (therm->fan_get && therm->fan_get(therm) >= 0) {
&hwmon_pwm_fan_attrgroup); ret = sysfs_create_group(&hwmon_dev->kobj,
if (ret) &hwmon_pwm_fan_attrgroup);
goto error; if (ret)
goto error;
}
} }
/* if the card can read the fan rpm */ /* if the card can read the fan rpm */
if (nvkm_therm_fan_sense(therm) >= 0) { if (therm && nvkm_therm_fan_sense(therm) >= 0) {
ret = sysfs_create_group(&hwmon_dev->kobj, ret = sysfs_create_group(&hwmon_dev->kobj,
&hwmon_fan_rpm_attrgroup); &hwmon_fan_rpm_attrgroup);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment