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

Commit 639c308e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb: 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 a8c4362b

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

+17 −0
Original line number Diff line number Diff line
@@ -220,5 +220,22 @@ 
#define nva3_clk_info gt215_clk_info

#define nva3_pll_info gt215_pll_info

#define nouveau_ibus nvkm_ibus

#define nouveau_memx nvkm_memx

#define nouveau_memx_block nvkm_memx_block

#define nouveau_memx_unblock nvkm_memx_unblock

#define nouveau_memx_train nvkm_memx_train

#define nouveau_memx_train_result nvkm_memx_train_result

#define nouveau_memx_wait_vblank nvkm_memx_wait_vblank

#define nouveau_memx_rd32 nvkm_memx_rd32

#define nouveau_memx_wr32 nvkm_memx_wr32

#define nouveau_memx_wait nvkm_memx_wait

#define nouveau_memx_init nvkm_memx_init

#define nouveau_memx_fini nvkm_memx_fini

#define nouveau_memx_nsec nvkm_memx_nsec

#define nouveau_ltc nvkm_ltc

#define nouveau_pmu nvkm_pmu

#define nouveau_fb nvkm_fb

#define nouveau_fb_tile nvkm_fb_tile

#define nvc0_pte_storage_type_map gf100_pte_storage_type_map



#endif

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

+61 −67
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_FB_H__

#define __NOUVEAU_FB_H__



#ifndef __NVKM_FB_H__

#define __NVKM_FB_H__

#include <core/subdev.h>

#include <core/device.h>

#include <core/mm.h>



#include <subdev/mmu.h>
@@ -24,14 +21,14 @@ 
#define NV_MEM_TYPE_VM 0x7f

#define NV_MEM_COMP_VM 0x03



struct nouveau_mem {

struct nvkm_mem {

	struct drm_device *dev;



	struct nouveau_vma bar_vma;

	struct nouveau_vma vma[2];

	struct nvkm_vma bar_vma;

	struct nvkm_vma vma[2];

	u8  page_shift;



	struct nouveau_mm_node *tag;

	struct nvkm_mm_node *tag;

	struct list_head regions;

	dma_addr_t *pages;

	u32 memtype;
@@ -40,85 +37,83 @@ struct nouveau_mem { 
	struct sg_table *sg;

};



struct nouveau_fb_tile {

	struct nouveau_mm_node *tag;

struct nvkm_fb_tile {

	struct nvkm_mm_node *tag;

	u32 addr;

	u32 limit;

	u32 pitch;

	u32 zcomp;

};



struct nouveau_fb {

	struct nouveau_subdev base;

struct nvkm_fb {

	struct nvkm_subdev base;



	bool (*memtype_valid)(struct nouveau_fb *, u32 memtype);

	bool (*memtype_valid)(struct nvkm_fb *, u32 memtype);



	struct nouveau_ram *ram;

	struct nvkm_ram *ram;



	struct nouveau_mm vram;

	struct nouveau_mm tags;

	struct nvkm_mm vram;

	struct nvkm_mm tags;



	struct {

		struct nouveau_fb_tile region[16];

		struct nvkm_fb_tile region[16];

		int regions;

		void (*init)(struct nouveau_fb *, int i, u32 addr, u32 size,

			     u32 pitch, u32 flags, struct nouveau_fb_tile *);

		void (*comp)(struct nouveau_fb *, int i, u32 size, u32 flags,

			     struct nouveau_fb_tile *);

		void (*fini)(struct nouveau_fb *, int i,

			     struct nouveau_fb_tile *);

		void (*prog)(struct nouveau_fb *, int i,

			     struct nouveau_fb_tile *);

		void (*init)(struct nvkm_fb *, int i, u32 addr, u32 size,

			     u32 pitch, u32 flags, struct nvkm_fb_tile *);

		void (*comp)(struct nvkm_fb *, int i, u32 size, u32 flags,

			     struct nvkm_fb_tile *);

		void (*fini)(struct nvkm_fb *, int i, struct nvkm_fb_tile *);

		void (*prog)(struct nvkm_fb *, int i, struct nvkm_fb_tile *);

	} tile;

};



static inline struct nouveau_fb *

nouveau_fb(void *obj)

static inline struct nvkm_fb *

nvkm_fb(void *obj)

{

	/* fbram uses this before device subdev pointer is valid */

	if (nv_iclass(obj, NV_SUBDEV_CLASS) &&

	    nv_subidx(obj) == NVDEV_SUBDEV_FB)

		return obj;



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

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

}



extern struct nouveau_oclass *nv04_fb_oclass;

extern struct nouveau_oclass *nv10_fb_oclass;

extern struct nouveau_oclass *nv1a_fb_oclass;

extern struct nouveau_oclass *nv20_fb_oclass;

extern struct nouveau_oclass *nv25_fb_oclass;

extern struct nouveau_oclass *nv30_fb_oclass;

extern struct nouveau_oclass *nv35_fb_oclass;

extern struct nouveau_oclass *nv36_fb_oclass;

extern struct nouveau_oclass *nv40_fb_oclass;

extern struct nouveau_oclass *nv41_fb_oclass;

extern struct nouveau_oclass *nv44_fb_oclass;

extern struct nouveau_oclass *nv46_fb_oclass;

extern struct nouveau_oclass *nv47_fb_oclass;

extern struct nouveau_oclass *nv49_fb_oclass;

extern struct nouveau_oclass *nv4e_fb_oclass;

extern struct nouveau_oclass *nv50_fb_oclass;

extern struct nouveau_oclass *nv84_fb_oclass;

extern struct nouveau_oclass *nva3_fb_oclass;

extern struct nouveau_oclass *nvaa_fb_oclass;

extern struct nouveau_oclass *nvaf_fb_oclass;

extern struct nouveau_oclass *nvc0_fb_oclass;

extern struct nouveau_oclass *nve0_fb_oclass;

extern struct nouveau_oclass *gk20a_fb_oclass;

extern struct nouveau_oclass *gm107_fb_oclass;

extern struct nvkm_oclass *nv04_fb_oclass;

extern struct nvkm_oclass *nv10_fb_oclass;

extern struct nvkm_oclass *nv1a_fb_oclass;

extern struct nvkm_oclass *nv20_fb_oclass;

extern struct nvkm_oclass *nv25_fb_oclass;

extern struct nvkm_oclass *nv30_fb_oclass;

extern struct nvkm_oclass *nv35_fb_oclass;

extern struct nvkm_oclass *nv36_fb_oclass;

extern struct nvkm_oclass *nv40_fb_oclass;

extern struct nvkm_oclass *nv41_fb_oclass;

extern struct nvkm_oclass *nv44_fb_oclass;

extern struct nvkm_oclass *nv46_fb_oclass;

extern struct nvkm_oclass *nv47_fb_oclass;

extern struct nvkm_oclass *nv49_fb_oclass;

extern struct nvkm_oclass *nv4e_fb_oclass;

extern struct nvkm_oclass *nv50_fb_oclass;

extern struct nvkm_oclass *g84_fb_oclass;

extern struct nvkm_oclass *gt215_fb_oclass;

extern struct nvkm_oclass *mcp77_fb_oclass;

extern struct nvkm_oclass *mcp89_fb_oclass;

extern struct nvkm_oclass *gf100_fb_oclass;

extern struct nvkm_oclass *gk104_fb_oclass;

extern struct nvkm_oclass *gk20a_fb_oclass;

extern struct nvkm_oclass *gm107_fb_oclass;



#include <subdev/bios.h>

#include <subdev/bios/ramcfg.h>



struct nouveau_ram_data {

struct nvkm_ram_data {

	struct list_head head;

	struct nvbios_ramcfg bios;

	u32 freq;

};



struct nouveau_ram {

	struct nouveau_object base;

struct nvkm_ram {

	struct nvkm_object base;

	enum {

		NV_MEM_TYPE_UNKNOWN = 0,

		NV_MEM_TYPE_STOLEN,
@@ -140,21 +135,20 @@ struct nouveau_ram { 
	int parts;

	int part_mask;



	int  (*get)(struct nouveau_fb *, u64 size, u32 align,

		    u32 size_nc, u32 type, struct nouveau_mem **);

	void (*put)(struct nouveau_fb *, struct nouveau_mem **);

	int  (*get)(struct nvkm_fb *, u64 size, u32 align, u32 size_nc,

		    u32 type, struct nvkm_mem **);

	void (*put)(struct nvkm_fb *, struct nvkm_mem **);



	int  (*calc)(struct nouveau_fb *, u32 freq);

	int  (*prog)(struct nouveau_fb *);

	void (*tidy)(struct nouveau_fb *);

	int  (*calc)(struct nvkm_fb *, u32 freq);

	int  (*prog)(struct nvkm_fb *);

	void (*tidy)(struct nvkm_fb *);

	u32 freq;

	u32 mr[16];

	u32 mr1_nuts;



	struct nouveau_ram_data *next;

	struct nouveau_ram_data former;

	struct nouveau_ram_data xition;

	struct nouveau_ram_data target;

	struct nvkm_ram_data *next;

	struct nvkm_ram_data former;

	struct nvkm_ram_data xition;

	struct nvkm_ram_data target;

};



#endif

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

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

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -129,7 +129,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -158,7 +158,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -187,7 +187,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -216,7 +216,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -245,7 +245,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -274,7 +274,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  g84_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -303,7 +303,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvaa_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  mcp77_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -332,7 +332,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvaa_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  mcp77_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -361,7 +361,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nva3_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gt215_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -392,7 +392,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nva3_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gt215_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -422,7 +422,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nva3_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gt215_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
@@ -452,7 +452,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  g94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvaf_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  mcp89_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &nv50_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;

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

+9 −9
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -105,7 +105,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -138,7 +138,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -170,7 +170,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -203,7 +203,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -235,7 +235,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -267,7 +267,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -300,7 +300,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -332,7 +332,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gf100_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gf100_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nvc0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

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

+7 −7
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -106,7 +106,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -140,7 +140,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -196,7 +196,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -230,7 +230,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -264,7 +264,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;
@@ -297,7 +297,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  gf100_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk104_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;