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

Commit 88524bc0 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/devinit: move simple pll setting routines to devinit 



These are pretty much useless for reclocking purposes.  Lets make it
clearer what they're for and move them to DEVINIT to signify they're
for the very simple PLL setting requirements of running the init
tables.

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

drivers/gpu/drm/nouveau/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ nouveau-y += core/subdev/devinit/nv10.o 
nouveau-y += core/subdev/devinit/nv1a.o

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

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

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

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

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

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

nouveau-y += core/subdev/fb/nv10.o

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

+4 −4
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -346,7 +346,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -372,7 +372,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -398,7 +398,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

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

+8 −8
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -91,7 +91,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -120,7 +120,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -148,7 +148,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -177,7 +177,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -206,7 +206,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -234,7 +234,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -263,7 +263,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_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_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

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

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_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_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -92,7 +92,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_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_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -122,7 +122,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_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_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -152,7 +152,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_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_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

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

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
#include <subdev/bios/disp.h>

#include <subdev/bios/init.h>

#include <subdev/bios/pll.h>

#include <subdev/devinit.h>

#include <subdev/timer.h>

#include <subdev/fb.h>

#include <subdev/clock.h>



#include "nv50.h"
@@ -987,10 +987,10 @@ nv50_disp_intr_unk20_0(struct nv50_disp_priv *priv, int head) 
static void

nv50_disp_intr_unk20_1(struct nv50_disp_priv *priv, int head)

{

	struct nouveau_clock *clk = nouveau_clock(priv);

	struct nouveau_devinit *devinit = nouveau_devinit(priv);

	u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

	if (pclk)

		clk->pll_set(clk, PLL_VPLL0 + head, pclk);

		devinit->pll_set(devinit, PLL_VPLL0 + head, pclk);

}



static void