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

Commit ef1df1bc authored Dec 02, 2014 by Vince Hsu Committed by Ben Skeggs Dec 02, 2014

drm/nouveau/volt: add support for GK20A



The voltage value are calculated by the hardware characterized
result.

Signed-off-by: Vince Hsu <vinceh@nvidia.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent 37025602

drivers/gpu/drm/nouveau/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ nouveau-y += core/subdev/vm/nvc0.o
		nouveau-y += core/subdev/volt/base.o
		nouveau-y += core/subdev/volt/gpio.o
		nouveau-y += core/subdev/volt/nv40.o
		nouveau-y += core/subdev/volt/gk20a.o

		nouveau-y += core/engine/falcon.o
		nouveau-y += core/engine/xtensa.o

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,7 @@ nve0_identify(struct nouveau_device *device)
		device->oclass[NVDEV_ENGINE_GR ] = gk20a_graph_oclass;
		device->oclass[NVDEV_ENGINE_COPY2 ] = &nve0_copy2_oclass;
		device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;
		device->oclass[NVDEV_SUBDEV_VOLT ] = &gk20a_volt_oclass;
		break;
		case 0xf0:
		device->cname = "GK110";

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ int _nouveau_volt_init(struct nouveau_object *);
		#define _nouveau_volt_fini _nouveau_subdev_fini

		extern struct nouveau_oclass nv40_volt_oclass;
		extern struct nouveau_oclass gk20a_volt_oclass;

		int nouveau_voltgpio_init(struct nouveau_volt *);
		int nouveau_voltgpio_get(struct nouveau_volt *);

drivers/gpu/drm/nouveau/core/os.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/pm_runtime.h>
		#include <linux/power_supply.h>
		#include <linux/clk.h>
		#include <linux/regulator/consumer.h>

		#include <asm/unaligned.h>

drivers/gpu/drm/nouveau/core/subdev/clock/gk20a.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -470,76 +470,91 @@ gk20a_pstates[] = {
		{
		.base = {
		.domain[nv_clk_src_gpc] = 72000,
		.voltage = 0,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 108000,
		.voltage = 1,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 180000,
		.voltage = 2,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 252000,
		.voltage = 3,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 324000,
		.voltage = 4,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 396000,
		.voltage = 5,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 468000,
		.voltage = 6,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 540000,
		.voltage = 7,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 612000,
		.voltage = 8,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 648000,
		.voltage = 9,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 684000,
		.voltage = 10,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 708000,
		.voltage = 11,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 756000,
		.voltage = 12,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 804000,
		.voltage = 13,
		},
		},
		{
		.base = {
		.domain[nv_clk_src_gpc] = 852000,
		.voltage = 14,
		},
		},
		};