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

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

drm/nouveau/devinit: namespace + nvidia gpu names (no binary change) 



The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

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

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -219,5 +219,6 @@ 
#define nva3_clk_post gt215_clk_post

#define nva3_clk_post gt215_clk_post

#define nva3_clk_info gt215_clk_info

#define nva3_clk_info gt215_clk_info

#define nva3_pll_info gt215_pll_info

#define nva3_pll_info gt215_pll_info

#define nouveau_ibus nvkm_ibus





#endif
 
#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h

+23 −26
Original line number Original line Diff line number Diff line 
#ifndef __NOUVEAU_DEVINIT_H__

#ifndef __NVKM_DEVINIT_H__

#define __NOUVEAU_DEVINIT_H__

#define __NVKM_DEVINIT_H__



#include <core/subdev.h>

#include <core/subdev.h>

#include <core/device.h>





struct nouveau_devinit {

struct nvkm_devinit {

	struct nouveau_subdev base;

	struct nvkm_subdev base;

	bool post;

	bool post;

	void (*meminit)(struct nouveau_devinit *);

	void (*meminit)(struct nvkm_devinit *);

	int  (*pll_set)(struct nouveau_devinit *, u32 type, u32 freq);

	int  (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq);

	u32  (*mmio)(struct nouveau_devinit *, u32 addr);

	u32  (*mmio)(struct nvkm_devinit *, u32 addr);

};

};





static inline struct nouveau_devinit *

static inline struct nvkm_devinit *

nouveau_devinit(void *obj)

nvkm_devinit(void *obj)

{

{

	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_DEVINIT);

	return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_DEVINIT);

}

}





extern struct nouveau_oclass *nv04_devinit_oclass;

extern struct nvkm_oclass *nv04_devinit_oclass;

extern struct nouveau_oclass *nv05_devinit_oclass;

extern struct nvkm_oclass *nv05_devinit_oclass;

extern struct nouveau_oclass *nv10_devinit_oclass;

extern struct nvkm_oclass *nv10_devinit_oclass;

extern struct nouveau_oclass *nv1a_devinit_oclass;

extern struct nvkm_oclass *nv1a_devinit_oclass;

extern struct nouveau_oclass *nv20_devinit_oclass;

extern struct nvkm_oclass *nv20_devinit_oclass;

extern struct nouveau_oclass *nv50_devinit_oclass;

extern struct nvkm_oclass *nv50_devinit_oclass;

extern struct nouveau_oclass *nv84_devinit_oclass;

extern struct nvkm_oclass *g84_devinit_oclass;

extern struct nouveau_oclass *nv98_devinit_oclass;

extern struct nvkm_oclass *g98_devinit_oclass;

extern struct nouveau_oclass *nva3_devinit_oclass;

extern struct nvkm_oclass *gt215_devinit_oclass;

extern struct nouveau_oclass *nvaf_devinit_oclass;

extern struct nvkm_oclass *mcp89_devinit_oclass;

extern struct nouveau_oclass *nvc0_devinit_oclass;

extern struct nvkm_oclass *gf100_devinit_oclass;

extern struct nouveau_oclass *gm107_devinit_oclass;

extern struct nvkm_oclass *gm107_devinit_oclass;

extern struct nouveau_oclass *gm204_devinit_oclass;

extern struct nvkm_oclass *gm204_devinit_oclass;



#endif
 
#endif

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

+13 −13
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -125,7 +125,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -154,7 +154,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -183,7 +183,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -212,7 +212,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -241,7 +241,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -270,7 +270,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -299,7 +299,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -328,7 +328,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  g98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -357,7 +357,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gt215_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -388,7 +388,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gt215_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -418,7 +418,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gt215_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -448,7 +448,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvaf_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  mcp89_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -101,7 +101,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -134,7 +134,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -166,7 +166,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -199,7 +199,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -231,7 +231,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -263,7 +263,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -296,7 +296,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -328,7 +328,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -102,7 +102,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -136,7 +136,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -192,7 +192,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -226,7 +226,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -260,7 +260,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -293,7 +293,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gf100_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;