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

drm/nouveau/fuse: convert to new-style nvkm_subdev 



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

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

+6 −23
Original line number Diff line number Diff line 
#ifndef __NVKM_FUSE_H__

#define __NVKM_FUSE_H__

#include <core/subdev.h>

#include <core/device.h>



struct nvkm_fuse {

	struct nvkm_subdev subdev;

	const struct nvkm_fuse_func *func;

	struct nvkm_subdev subdev;

	spinlock_t lock;

};



struct nvkm_fuse_func {

	u32 (*read)(struct nvkm_fuse *, u32 addr);

};



static inline struct nvkm_fuse *

nvkm_fuse(void *obj)

{

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

}



#define nvkm_fuse_create(p, e, o, d)                                        \

	nvkm_fuse_create_((p), (e), (o), sizeof(**d), (void **)d)



int  nvkm_fuse_create_(struct nvkm_object *, struct nvkm_object *,

			  struct nvkm_oclass *, int, void **);

void _nvkm_fuse_dtor(struct nvkm_object *);

int  _nvkm_fuse_init(struct nvkm_object *);

#define _nvkm_fuse_fini _nvkm_subdev_fini

u32 nvkm_fuse_read(struct nvkm_fuse *, u32 addr);



extern struct nvkm_oclass nv50_fuse_oclass;

extern struct nvkm_oclass gf100_fuse_oclass;

extern struct nvkm_oclass gm107_fuse_oclass;

int nv50_fuse_new(struct nvkm_device *, int, struct nvkm_fuse **);

int gf100_fuse_new(struct nvkm_device *, int, struct nvkm_fuse **);

int gm107_fuse_new(struct nvkm_device *, int, struct nvkm_fuse **);

#endif

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

+35 −35
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ nv50_chipset = { 
	.clk = nv50_clk_new,

	.devinit = nv50_devinit_new,

	.fb = nv50_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,
@@ -887,7 +887,7 @@ nv84_chipset = { 
	.clk = g84_clk_new,

	.devinit = g84_devinit_new,

	.fb = g84_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,
@@ -918,7 +918,7 @@ nv86_chipset = { 
	.clk = g84_clk_new,

	.devinit = g84_devinit_new,

	.fb = g84_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,
@@ -949,7 +949,7 @@ nv92_chipset = { 
	.clk = g84_clk_new,

	.devinit = g84_devinit_new,

	.fb = g84_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,
@@ -980,7 +980,7 @@ nv94_chipset = { 
	.clk = g84_clk_new,

	.devinit = g84_devinit_new,

	.fb = g84_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1008,7 +1008,7 @@ nv96_chipset = { 
	.bios = nvkm_bios_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

	.clk = g84_clk_new,

//	.therm = g84_therm_new,

//	.mxm = nv50_mxm_new,
@@ -1039,7 +1039,7 @@ nv98_chipset = { 
	.bios = nvkm_bios_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

	.clk = g84_clk_new,

//	.therm = g84_therm_new,

//	.mxm = nv50_mxm_new,
@@ -1073,7 +1073,7 @@ nva0_chipset = { 
	.clk = g84_clk_new,

	.devinit = g84_devinit_new,

	.fb = g84_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1104,7 +1104,7 @@ nva3_chipset = { 
	.clk = gt215_clk_new,

	.devinit = gt215_devinit_new,

	.fb = gt215_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1137,7 +1137,7 @@ nva5_chipset = { 
	.clk = gt215_clk_new,

	.devinit = gt215_devinit_new,

	.fb = gt215_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1169,7 +1169,7 @@ nva8_chipset = { 
	.clk = gt215_clk_new,

	.devinit = gt215_devinit_new,

	.fb = gt215_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1201,7 +1201,7 @@ nvaa_chipset = { 
	.clk = mcp77_clk_new,

	.devinit = g98_devinit_new,

	.fb = mcp77_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1232,7 +1232,7 @@ nvac_chipset = { 
	.clk = mcp77_clk_new,

	.devinit = g98_devinit_new,

	.fb = mcp77_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1263,7 +1263,7 @@ nvaf_chipset = { 
	.clk = gt215_clk_new,

	.devinit = mcp89_devinit_new,

	.fb = mcp89_fb_new,

//	.fuse = nv50_fuse_new,

	.fuse = nv50_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,
@@ -1295,7 +1295,7 @@ nvc0_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1330,7 +1330,7 @@ nvc1_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1364,7 +1364,7 @@ nvc3_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1398,7 +1398,7 @@ nvc4_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1433,7 +1433,7 @@ nvc8_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1468,7 +1468,7 @@ nvce_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1503,7 +1503,7 @@ nvcf_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1537,7 +1537,7 @@ nvd7_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gf110_gpio_new,

//	.i2c = gf117_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1569,7 +1569,7 @@ nvd9_chipset = { 
	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gf110_gpio_new,

//	.i2c = gf110_i2c_new,

//	.ibus = gf100_ibus_new,
@@ -1603,7 +1603,7 @@ nve4_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1639,7 +1639,7 @@ nve6_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1675,7 +1675,7 @@ nve7_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1709,7 +1709,7 @@ nvea_chipset = { 
	.bus = gf100_bus_new,

	.clk = gk20a_clk_new,

	.fb = gk20a_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.ibus = gk20a_ibus_new,

//	.imem = gk20a_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1735,7 +1735,7 @@ nvf0_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1771,7 +1771,7 @@ nvf1_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gf110_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1807,7 +1807,7 @@ nv106_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1842,7 +1842,7 @@ nv108_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gf100_devinit_new,

	.fb = gk104_fb_new,

//	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1877,7 +1877,7 @@ nv117_chipset = { 
	.clk = gk104_clk_new,

	.devinit = gm107_devinit_new,

	.fb = gm107_fb_new,

//	.fuse = gm107_fuse_new,

	.fuse = gm107_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gf110_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1906,7 +1906,7 @@ nv124_chipset = { 
	.bus = gf100_bus_new,

	.devinit = gm204_devinit_new,

	.fb = gm107_fb_new,

//	.fuse = gm107_fuse_new,

	.fuse = gm107_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gm204_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1935,7 +1935,7 @@ nv126_chipset = { 
	.bus = gf100_bus_new,

	.devinit = gm204_devinit_new,

	.fb = gm107_fb_new,

//	.fuse = gm107_fuse_new,

	.fuse = gm107_fuse_new,

//	.gpio = gk104_gpio_new,

//	.i2c = gm204_i2c_new,

//	.ibus = gk104_ibus_new,
@@ -1962,7 +1962,7 @@ nv12b_chipset = { 
	.bar = gk20a_bar_new,

	.bus = gf100_bus_new,

	.fb = gk20a_fb_new,

//	.fuse = gm107_fuse_new,

	.fuse = gm107_fuse_new,

//	.ibus = gk20a_ibus_new,

//	.imem = gk20a_instmem_new,

//	.ltc = gm107_ltc_new,

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

+0 −9
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xc0:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;
@@ -56,7 +55,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xc4:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;
@@ -82,7 +80,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xc3:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -107,7 +104,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xce:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;
@@ -133,7 +129,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xcf:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -158,7 +153,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xc1:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -183,7 +177,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xc8:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gt215_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf100_mc_oclass;
@@ -209,7 +202,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xd9:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gf110_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -234,7 +226,6 @@ gf100_identify(struct nvkm_device *device) 
	case 0xd7:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gf110_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf117_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;

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

+0 −8
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0xe4:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -57,7 +56,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0xe7:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -84,7 +82,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0xe6:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -110,7 +107,6 @@ gk104_identify(struct nvkm_device *device) 
		break;

	case 0xea:

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk20a_ibus_oclass;
@@ -128,7 +124,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0xf0:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -155,7 +150,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0xf1:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gf106_mc_oclass;
@@ -182,7 +176,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0x106:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;
@@ -208,7 +201,6 @@ gk104_identify(struct nvkm_device *device) 
	case 0x108:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gf110_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

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

+0 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ gm100_identify(struct nvkm_device *device) 
	case 0x117:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;
@@ -63,7 +62,6 @@ gm100_identify(struct nvkm_device *device) 
	case 0x124:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gm204_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

#if 0

		/* looks to be some non-trivial changes */

		/* priv ring says no to 0x10eb14 writes */
@@ -97,7 +95,6 @@ gm100_identify(struct nvkm_device *device) 
	case 0x126:

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gm204_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

#if 0

		/* looks to be some non-trivial changes */

		/* priv ring says no to 0x10eb14 writes */
@@ -132,7 +129,6 @@ gm100_identify(struct nvkm_device *device) 


		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &gf100_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gm107_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk20a_ibus_oclass;