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

drm/gm107/therm: add PWM fan support v2 



v2: change the copyright ownership from "Nouveau Community" to myself, as per
Illia's recommendation.

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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ nouveau-y += core/subdev/therm/nv50.o 
nouveau-y += core/subdev/therm/nv84.o

nouveau-y += core/subdev/therm/nva3.o

nouveau-y += core/subdev/therm/nvd0.o

nouveau-y += core/subdev/therm/gm107.o

nouveau-y += core/subdev/timer/base.o

nouveau-y += core/subdev/timer/nv04.o

nouveau-y += core/subdev/timer/gk20a.o

drivers/gpu/drm/nouveau/core/engine/device/gm100.c

+1 −3
Original line number Diff line number Diff line
@@ -63,9 +63,7 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

#if 0

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

#endif

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gm107_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

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

+1 −0
Original line number Diff line number Diff line
@@ -78,5 +78,6 @@ extern struct nouveau_oclass nv50_therm_oclass; 
extern struct nouveau_oclass nv84_therm_oclass;

extern struct nouveau_oclass nva3_therm_oclass;

extern struct nouveau_oclass nvd0_therm_oclass;

extern struct nouveau_oclass gm107_therm_oclass;



#endif

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

+7 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <subdev/gpio.h>

#include <subdev/timer.h>



#include <subdev/bios/fan.h>



static int

nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target)

{
@@ -275,8 +277,11 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm) 
	/* other random init... */

	nouveau_therm_fan_set_defaults(therm);

	nvbios_perf_fan_parse(bios, &priv->fan->perf);

	if (!nvbios_fan_parse(bios, &priv->fan->bios)) {

		nv_debug(therm, "parsing the fan table failed\n");

		if (nvbios_therm_fan_parse(bios, &priv->fan->bios))

		nv_error(therm, "parsing the thermal table failed\n");

			nv_error(therm, "parsing both fan tables failed\n");

	}

	nouveau_therm_fan_safety_checks(therm);

	return 0;

}

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

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014 Martin Peres

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Martin Peres

 */



#include "priv.h"



struct gm107_therm_priv {

	struct nouveau_therm_priv base;

};



static int

gm107_fan_pwm_ctrl(struct nouveau_therm *therm, int line, bool enable)

{

	/* nothing to do, it seems hardwired */

	return 0;

}



static int

gm107_fan_pwm_get(struct nouveau_therm *therm, int line, u32 *divs, u32 *duty)

{

	*divs = nv_rd32(therm, 0x10eb20) & 0x1fff;

	*duty = nv_rd32(therm, 0x10eb24) & 0x1fff;

	return 0;

}



static int

gm107_fan_pwm_set(struct nouveau_therm *therm, int line, u32 divs, u32 duty)

{

	nv_mask(therm, 0x10eb10, 0x1fff, divs); /* keep the high bits */

	nv_wr32(therm, 0x10eb14, duty | 0x80000000);

	return 0;

}



static int

gm107_fan_pwm_clock(struct nouveau_therm *therm, int line)

{

	return nv_device(therm)->crystal * 1000;

}



static int

gm107_therm_ctor(struct nouveau_object *parent,

		struct nouveau_object *engine,

		struct nouveau_oclass *oclass, void *data, u32 size,

		struct nouveau_object **pobject)

{

	struct gm107_therm_priv *priv;

	int ret;



	ret = nouveau_therm_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	priv->base.base.pwm_ctrl = gm107_fan_pwm_ctrl;

	priv->base.base.pwm_get = gm107_fan_pwm_get;

	priv->base.base.pwm_set = gm107_fan_pwm_set;

	priv->base.base.pwm_clock = gm107_fan_pwm_clock;

	priv->base.base.temp_get = nv84_temp_get;

	priv->base.base.fan_sense = nva3_therm_fan_sense;

	priv->base.sensor.program_alarms = nouveau_therm_program_alarms_polling;

	return nouveau_therm_preinit(&priv->base.base);

}



struct nouveau_oclass

gm107_therm_oclass = {

	.handle = NV_SUBDEV(THERM, 0x117),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = gm107_therm_ctor,

		.dtor = _nouveau_therm_dtor,

		.init = nvd0_therm_init,

		.fini = nv84_therm_fini,

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE