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

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

drm/nouveau/therm: add support for fan-control modes 



For now, only 2 control modes are available:
- NONE: The fan is never touched (default)
- MANUAL: The fan is set to the user-defined fan speed (pwm1)

This patch introduces a distinction between ptherm internal fan management
and external fan management. The latter is bound to respect the fan mode
while the first can still select the speed it wants unless the NONE mode
is selected. This is important for automatic fan management.

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

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

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ nouveau_therm_attr_get(struct nouveau_therm *therm, 
		return priv->bios_fan.min_duty;

	case NOUVEAU_THERM_ATTR_FAN_MAX_DUTY:

		return priv->bios_fan.max_duty;

	case NOUVEAU_THERM_ATTR_FAN_MODE:

		return priv->fan.mode;

	case NOUVEAU_THERM_ATTR_THRS_FAN_BOOST:

		return priv->bios_sensor.thrs_fan_boost.temp;

	case NOUVEAU_THERM_ATTR_THRS_FAN_BOOST_HYST:
@@ -82,6 +84,8 @@ nouveau_therm_attr_set(struct nouveau_therm *therm, 
			value = priv->bios_fan.min_duty;

		priv->bios_fan.max_duty = value;

		return 0;

	case NOUVEAU_THERM_ATTR_FAN_MODE:

		return nouveau_therm_fan_set_mode(therm, value);

	case NOUVEAU_THERM_ATTR_THRS_FAN_BOOST:

		priv->bios_sensor.thrs_fan_boost.temp = value;

		return 0;

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

+51 −1
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ nouveau_therm_fan_set(struct nouveau_therm *therm, int percent) 
	u32 divs, duty;

	int ret;



	if (priv->fan.mode == FAN_CONTROL_NONE)

		return -EINVAL;



	if (!priv->fan.pwm_set)

		return -ENODEV;
@@ -138,7 +141,52 @@ nouveau_therm_fan_sense(struct nouveau_therm *therm) 
		return 0;

}



static void

int

nouveau_therm_fan_set_mode(struct nouveau_therm *therm,

			   enum nouveau_therm_fan_mode mode)

{

	struct nouveau_therm_priv *priv = (void *)therm;



	if (priv->fan.mode == mode)

		return 0;



	if (mode < FAN_CONTROL_NONE || mode >= FAN_CONTROL_NR)

		return -EINVAL;



	switch (mode)

	{

	case FAN_CONTROL_NONE:

		nv_info(therm, "switch fan to no-control mode\n");

		break;

	case FAN_CONTROL_MANUAL:

		nv_info(therm, "switch fan to manual mode\n");

		break;

	case FAN_CONTROL_NR:

		break;

	}



	priv->fan.mode = mode;

	return 0;

}



int

nouveau_therm_fan_user_get(struct nouveau_therm *therm)

{

	return nouveau_therm_fan_get(therm);

}



int

nouveau_therm_fan_user_set(struct nouveau_therm *therm, int percent)

{

	struct nouveau_therm_priv *priv = (void *)therm;



	if (priv->fan.mode != FAN_CONTROL_MANUAL)

		return -EINVAL;



	return nouveau_therm_fan_set(therm, percent);

}



void

nouveau_therm_fan_set_defaults(struct nouveau_therm *therm)

{

	struct nouveau_therm_priv *priv = (void *)therm;
@@ -180,5 +228,7 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm) 
		nv_error(therm, "parsing the thermal table failed\n");

	nouveau_therm_fan_safety_checks(therm);



	nouveau_therm_fan_set_mode(therm, FAN_CONTROL_NONE);



	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ nv40_therm_ctor(struct nouveau_object *parent, 
	priv->fan.pwm_set = nv40_fan_pwm_set;



	therm->temp_get = nv40_temp_get;

	therm->fan_get = nouveau_therm_fan_get;

	therm->fan_set = nouveau_therm_fan_set;

	therm->fan_get = nouveau_therm_fan_user_get;

	therm->fan_set = nouveau_therm_fan_user_set;

	therm->fan_sense = nouveau_therm_fan_sense;

	therm->attr_get = nouveau_therm_attr_get;

	therm->attr_set = nouveau_therm_attr_set;

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

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ nv50_therm_ctor(struct nouveau_object *parent, 
	priv->fan.pwm_clock = nv50_fan_pwm_clock;



	therm->temp_get = nv50_temp_get;

	therm->fan_get = nouveau_therm_fan_get;

	therm->fan_set = nouveau_therm_fan_set;

	therm->fan_get = nouveau_therm_fan_user_get;

	therm->fan_set = nouveau_therm_fan_user_set;

	therm->fan_sense = nouveau_therm_fan_sense;

	therm->attr_get = nouveau_therm_attr_get;

	therm->attr_set = nouveau_therm_attr_set;

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

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct nouveau_therm_priv { 


	/* fan priv */

	struct {

		enum nouveau_therm_fan_mode mode;

		int percent;



		int (*pwm_get)(struct nouveau_therm *, int line, u32*, u32*);
@@ -63,5 +64,10 @@ int nouveau_therm_sensor_ctor(struct nouveau_therm *therm); 
int nouveau_therm_fan_ctor(struct nouveau_therm *therm);

int nouveau_therm_fan_get(struct nouveau_therm *therm);

int nouveau_therm_fan_set(struct nouveau_therm *therm, int percent);

int nouveau_therm_fan_user_get(struct nouveau_therm *therm);

int nouveau_therm_fan_user_set(struct nouveau_therm *therm, int percent);

int nouveau_therm_fan_set_mode(struct nouveau_therm *therm,

			   enum nouveau_therm_fan_mode mode);





int nouveau_therm_fan_sense(struct nouveau_therm *therm);