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

Commit 7c856522 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/clk: implement power state and engine clock control in core 



User control of this has been hard-coded as disabled for now.

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

drivers/gpu/drm/nouveau/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -47,16 +47,20 @@ nouveau-y += core/subdev/bios/therm.o 
nouveau-y += core/subdev/bios/vmap.o

nouveau-y += core/subdev/bios/volt.o

nouveau-y += core/subdev/bios/xpio.o

nouveau-y += core/subdev/bus/hwsq.o

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

nouveau-y += core/subdev/bus/nv31.o

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

nouveau-y += core/subdev/bus/nv94.o

nouveau-y += core/subdev/bus/nvc0.o

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

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

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

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

nouveau-y += core/subdev/clock/nv84.o

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

nouveau-y += core/subdev/clock/nvc0.o

nouveau-y += core/subdev/clock/nve0.o

nouveau-y += core/subdev/clock/pllnv04.o

nouveau-y += core/subdev/clock/pllnva3.o

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

drivers/gpu/drm/nouveau/core/core/option.c

+0 −9
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ 
#include <core/option.h>

#include <core/debug.h>



/* compares unterminated string 'str' with zero-terminated string 'cmp' */

static inline int

strncasecmpz(const char *str, const char *cmp, size_t len)

{

	if (strlen(cmp) != len)

		return len;

	return strncasecmp(str, cmp, len);

}



const char *

nouveau_stropt(const char *optstr, const char *opt, int *arglen)

{

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

+10 −10
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv50_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -87,7 +87,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -115,7 +115,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -143,7 +143,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -171,7 +171,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -199,7 +199,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -227,7 +227,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -255,7 +255,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -283,7 +283,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;
@@ -311,7 +311,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv50_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

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

+5 −5
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;
@@ -95,7 +95,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;
@@ -128,7 +128,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;
@@ -161,7 +161,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;
@@ -196,7 +196,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

drivers/gpu/drm/nouveau/core/include/core/option.h

+9 −0
Original line number Diff line number Diff line
@@ -8,4 +8,13 @@ bool nouveau_boolopt(const char *optstr, const char *opt, bool value); 


int nouveau_dbgopt(const char *optstr, const char *sub);



/* compares unterminated string 'str' with zero-terminated string 'cmp' */

static inline int

strncasecmpz(const char *str, const char *cmp, size_t len)

{

	if (strlen(cmp) != len)

		return len;

	return strncasecmp(str, cmp, len);

}



#endif