Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4ce9246 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs
Browse files

drm/nouveau/therm: remove some confusion introduced by therm_mode 



The kernel message "[  PTHERM][0000:01:00.0] Thermal management: disabled"
is misleading as it actually means "fan management: disabled".

This patch fixes both the source and the message to improve readability.

Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7591782b

drivers/gpu/drm/nouveau/core/include/subdev/therm.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <core/device.h>

#include <core/subdev.h>



enum nouveau_therm_mode {

enum nouveau_therm_fan_mode {

	NOUVEAU_THERM_CTRL_NONE = 0,

	NOUVEAU_THERM_CTRL_MANUAL = 1,

	NOUVEAU_THERM_CTRL_AUTO = 2,

drivers/gpu/drm/nouveau/core/subdev/therm/base.c

+5 −5
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ nouveau_therm_alarm(struct nouveau_alarm *alarm) 
}



int

nouveau_therm_mode(struct nouveau_therm *therm, int mode)

nouveau_therm_fan_mode(struct nouveau_therm *therm, int mode)

{

	struct nouveau_therm_priv *priv = (void *)therm;

	struct nouveau_device *device = nv_device(therm);
@@ -152,7 +152,7 @@ nouveau_therm_mode(struct nouveau_therm *therm, int mode) 
	if (priv->mode == mode)

		return 0;



	nv_info(therm, "Thermal management: %s\n", name[mode]);

	nv_info(therm, "fan management: %s\n", name[mode]);

	nouveau_therm_update(therm, mode);

	return 0;

}
@@ -213,7 +213,7 @@ nouveau_therm_attr_set(struct nouveau_therm *therm, 
		priv->fan->bios.max_duty = value;

		return 0;

	case NOUVEAU_THERM_ATTR_FAN_MODE:

		return nouveau_therm_mode(therm, value);

		return nouveau_therm_fan_mode(therm, value);

	case NOUVEAU_THERM_ATTR_THRS_FAN_BOOST:

		priv->bios_sensor.thrs_fan_boost.temp = value;

		priv->sensor.program_alarms(therm);
@@ -263,7 +263,7 @@ _nouveau_therm_init(struct nouveau_object *object) 
		return ret;



	if (priv->suspend >= 0)

		nouveau_therm_mode(therm, priv->mode);

		nouveau_therm_fan_mode(therm, priv->mode);

	priv->sensor.program_alarms(therm);

	return 0;

}
@@ -317,7 +317,7 @@ nouveau_therm_preinit(struct nouveau_therm *therm) 
	nouveau_therm_sensor_ctor(therm);

	nouveau_therm_fan_ctor(therm);



	nouveau_therm_mode(therm, NOUVEAU_THERM_CTRL_NONE);

	nouveau_therm_fan_mode(therm, NOUVEAU_THERM_CTRL_NONE);

	return 0;

}

drivers/gpu/drm/nouveau/core/subdev/therm/priv.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ struct nouveau_therm_priv { 
	struct i2c_client *ic;

};



int nouveau_therm_mode(struct nouveau_therm *therm, int mode);

int nouveau_therm_fan_mode(struct nouveau_therm *therm, int mode);

int nouveau_therm_attr_get(struct nouveau_therm *therm,

		       enum nouveau_therm_attr_type type);

int nouveau_therm_attr_set(struct nouveau_therm *therm,

drivers/gpu/drm/nouveau/core/subdev/therm/temp.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void nouveau_therm_sensor_event(struct nouveau_therm *therm, 
	case NOUVEAU_THERM_THRS_FANBOOST:

		if (active) {

			nouveau_therm_fan_set(therm, true, 100);

			nouveau_therm_mode(therm, NOUVEAU_THERM_CTRL_AUTO);

			nouveau_therm_fan_mode(therm, NOUVEAU_THERM_CTRL_AUTO);

		}

		break;

	case NOUVEAU_THERM_THRS_DOWNCLOCK: