Commit bc79202f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

nvd0/therm: implement more appropriate pwm fan control functions 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 88b62b91

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ nouveau-y += core/subdev/therm/fan.o 
nouveau-y += core/subdev/therm/ic.o

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

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

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

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -54,5 +54,6 @@ nouveau_therm(void *obj) 


extern struct nouveau_oclass nv40_therm_oclass;

extern struct nouveau_oclass nv50_therm_oclass;

extern struct nouveau_oclass nvd0_therm_oclass;



#endif

drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv50_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

drivers/gpu/drm/nouveau/core/subdev/device/nve0.c

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv50_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;
@@ -87,7 +87,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv50_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;
@@ -115,7 +115,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv50_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

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

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

 * Copyright 2012 Red Hat Inc.

 *

 * 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: Ben Skeggs

 */



#include "priv.h"



static int

pwm_info(struct nouveau_therm *therm, int line)

{

	u32 gpio = nv_rd32(therm, 0x00d610 + (line * 0x04));

	if (gpio & 0x00000040) {

		switch (gpio & 0x0000001f) {

		case 0x19: return 1;

		case 0x1c: return 0;

		default:

			break;

		}

	}



	nv_error(therm, "GPIO %d unknown PWM: 0x%08x\n", line, gpio);

	return -EINVAL;

}



static int

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

{

	int indx = pwm_info(therm, line);

	if (indx < 0)

		return indx;



	*divs = nv_rd32(therm, 0x00e114 + (indx * 8));

	*duty = nv_rd32(therm, 0x00e118 + (indx * 8));

	return 0;

}



static int

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

{

	int indx = pwm_info(therm, line);

	if (indx < 0)

		return indx;



	nv_wr32(therm, 0x00e114 + (indx * 8), divs);

	nv_wr32(therm, 0x00e118 + (indx * 8), duty | 0x80000000);

	return 0;

}



static int

nvd0_fan_pwm_clock(struct nouveau_therm *therm)

{

	return (nv_device(therm)->crystal * 1000) / 20;

}



static int

nvd0_therm_ctor(struct nouveau_object *parent,

		   struct nouveau_object *engine,

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

		   struct nouveau_object **pobject)

{

	struct nouveau_therm_priv *priv;

	struct nouveau_therm *therm;

	int ret;



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

	*pobject = nv_object(priv);

	therm = (void *) priv;

	if (ret)

		return ret;



	nouveau_therm_ic_ctor(therm);

	nouveau_therm_sensor_ctor(therm);

	nouveau_therm_fan_ctor(therm);



	priv->fan.pwm_get = nvd0_fan_pwm_get;

	priv->fan.pwm_set = nvd0_fan_pwm_set;

	priv->fan.pwm_clock = nvd0_fan_pwm_clock;



	therm->temp_get = nv50_temp_get;

	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;

	return 0;

}



struct nouveau_oclass

nvd0_therm_oclass = {

	.handle = NV_SUBDEV(THERM, 0xd0),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nvd0_therm_ctor,

		.dtor = _nouveau_therm_dtor,

		.init = nouveau_therm_init,

		.fini = nouveau_therm_fini,

	},

};