Commit 49bd8da5 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

drivers/gpu/drm/nouveau/include/nvif/device.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ u64 nvif_device_time(struct nvif_device *); 
#define nvxx_bar(a) nvxx_device(a)->bar

#define nvxx_gpio(a) nvxx_device(a)->gpio

#define nvxx_clk(a) nvxx_device(a)->clk

#define nvxx_i2c(a) nvkm_i2c(nvxx_device(a))

#define nvxx_i2c(a) nvxx_device(a)->i2c

#define nvxx_therm(a) nvkm_therm(nvxx_device(a))



#include <core/device.h>

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

+11 −15
Original line number Diff line number Diff line
@@ -69,31 +69,27 @@ int nvkm_i2c_aux_lnk_ctl(struct nvkm_i2c_aux *, int link_nr, int link_bw, 
			 bool enhanced_framing);



struct nvkm_i2c {

	const struct nvkm_i2c_func *func;

	struct nvkm_subdev subdev;

	struct nvkm_event event;



	struct list_head pad;

	struct list_head bus;

	struct list_head aux;



	struct nvkm_event event;

};



struct nvkm_i2c_bus *nvkm_i2c_bus_find(struct nvkm_i2c *, int);

struct nvkm_i2c_aux *nvkm_i2c_aux_find(struct nvkm_i2c *, int);



static inline struct nvkm_i2c *

nvkm_i2c(void *obj)

{

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

}



extern struct nvkm_oclass *nv04_i2c_oclass;

extern struct nvkm_oclass *nv4e_i2c_oclass;

extern struct nvkm_oclass *nv50_i2c_oclass;

extern struct nvkm_oclass *g94_i2c_oclass;

extern struct nvkm_oclass *gf110_i2c_oclass;

extern struct nvkm_oclass *gf117_i2c_oclass;

extern struct nvkm_oclass *gk104_i2c_oclass;

extern struct nvkm_oclass *gm204_i2c_oclass;

int nv04_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int nv4e_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int nv50_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int g94_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gf117_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gf119_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk104_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gm204_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);



static inline int

nvkm_rdi2cr(struct i2c_adapter *adap, u8 addr, u8 reg)

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

+67 −67
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ nv4_chipset = { 
	.clk = nv04_clk_new,

	.devinit = nv04_devinit_new,

	.fb = nv04_fb_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -101,7 +101,7 @@ nv5_chipset = { 
	.clk = nv04_clk_new,

	.devinit = nv05_devinit_new,

	.fb = nv04_fb_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -122,7 +122,7 @@ nv10_chipset = { 
	.devinit = nv10_devinit_new,

	.fb = nv10_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -141,7 +141,7 @@ nv11_chipset = { 
	.devinit = nv10_devinit_new,

	.fb = nv10_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -162,7 +162,7 @@ nv15_chipset = { 
	.devinit = nv10_devinit_new,

	.fb = nv10_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -183,7 +183,7 @@ nv17_chipset = { 
	.devinit = nv10_devinit_new,

	.fb = nv10_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -204,7 +204,7 @@ nv18_chipset = { 
	.devinit = nv10_devinit_new,

	.fb = nv10_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -225,7 +225,7 @@ nv1a_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv1a_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -246,7 +246,7 @@ nv1f_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv1a_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -267,7 +267,7 @@ nv20_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv20_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -288,7 +288,7 @@ nv25_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv25_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -309,7 +309,7 @@ nv28_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv25_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -330,7 +330,7 @@ nv2a_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv25_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -351,7 +351,7 @@ nv30_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv30_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -372,7 +372,7 @@ nv31_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv30_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -394,7 +394,7 @@ nv34_chipset = { 
	.devinit = nv10_devinit_new,

	.fb = nv10_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -416,7 +416,7 @@ nv35_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv35_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -437,7 +437,7 @@ nv36_chipset = { 
	.devinit = nv20_devinit_new,

	.fb = nv36_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv04_instmem_new,

//	.mc = nv04_mc_new,

//	.mmu = nv04_mmu_new,
@@ -459,7 +459,7 @@ nv40_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv40_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv04_mmu_new,
@@ -484,7 +484,7 @@ nv41_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv41_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv41_mmu_new,
@@ -509,7 +509,7 @@ nv42_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv41_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv41_mmu_new,
@@ -534,7 +534,7 @@ nv43_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv41_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv41_mmu_new,
@@ -559,7 +559,7 @@ nv44_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv44_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv44_mc_new,

//	.mmu = nv44_mmu_new,
@@ -584,7 +584,7 @@ nv45_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv40_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv04_mmu_new,
@@ -609,7 +609,7 @@ nv46_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv46_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv44_mc_new,

//	.mmu = nv44_mmu_new,
@@ -634,7 +634,7 @@ nv47_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv47_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv41_mmu_new,
@@ -659,7 +659,7 @@ nv49_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv49_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv41_mmu_new,
@@ -684,7 +684,7 @@ nv4a_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv44_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv44_mc_new,

//	.mmu = nv44_mmu_new,
@@ -709,7 +709,7 @@ nv4b_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv49_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv40_mc_new,

//	.mmu = nv41_mmu_new,
@@ -734,7 +734,7 @@ nv4c_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv46_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv4c_mc_new,

//	.mmu = nv44_mmu_new,
@@ -759,7 +759,7 @@ nv4e_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv4e_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv4e_i2c_new,

	.i2c = nv4e_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv4c_mc_new,

//	.mmu = nv44_mmu_new,
@@ -786,7 +786,7 @@ nv50_chipset = { 
	.fb = nv50_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = nv50_mc_new,

//	.mmu = nv50_mmu_new,
@@ -812,7 +812,7 @@ nv63_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv46_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv4c_mc_new,

//	.mmu = nv44_mmu_new,
@@ -837,7 +837,7 @@ nv67_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv46_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv4c_mc_new,

//	.mmu = nv44_mmu_new,
@@ -862,7 +862,7 @@ nv68_chipset = { 
	.devinit = nv1a_devinit_new,

	.fb = nv46_fb_new,

	.gpio = nv10_gpio_new,

//	.i2c = nv04_i2c_new,

	.i2c = nv04_i2c_new,

//	.imem = nv40_instmem_new,

//	.mc = nv4c_mc_new,

//	.mmu = nv44_mmu_new,
@@ -889,7 +889,7 @@ nv84_chipset = { 
	.fb = g84_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = nv50_mc_new,

//	.mmu = nv50_mmu_new,
@@ -920,7 +920,7 @@ nv86_chipset = { 
	.fb = g84_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = nv50_mc_new,

//	.mmu = nv50_mmu_new,
@@ -951,7 +951,7 @@ nv92_chipset = { 
	.fb = g84_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = nv50_gpio_new,

//	.i2c = nv50_i2c_new,

	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = nv50_mc_new,

//	.mmu = nv50_mmu_new,
@@ -982,7 +982,7 @@ nv94_chipset = { 
	.fb = g84_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g94_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1007,7 +1007,7 @@ nv96_chipset = { 
	.name = "G96",

	.bios = nvkm_bios_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

	.fuse = nv50_fuse_new,

	.clk = g84_clk_new,

//	.therm = g84_therm_new,
@@ -1038,7 +1038,7 @@ nv98_chipset = { 
	.name = "G98",

	.bios = nvkm_bios_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

	.fuse = nv50_fuse_new,

	.clk = g84_clk_new,

//	.therm = g84_therm_new,
@@ -1075,7 +1075,7 @@ nva0_chipset = { 
	.fb = g84_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = nv50_i2c_new,

	.i2c = nv50_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1106,7 +1106,7 @@ nva3_chipset = { 
	.fb = gt215_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1139,7 +1139,7 @@ nva5_chipset = { 
	.fb = gt215_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1171,7 +1171,7 @@ nva8_chipset = { 
	.fb = gt215_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1203,7 +1203,7 @@ nvaa_chipset = { 
	.fb = mcp77_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1234,7 +1234,7 @@ nvac_chipset = { 
	.fb = mcp77_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1265,7 +1265,7 @@ nvaf_chipset = { 
	.fb = mcp89_fb_new,

	.fuse = nv50_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.imem = nv50_instmem_new,

//	.mc = g98_mc_new,

//	.mmu = nv50_mmu_new,
@@ -1297,7 +1297,7 @@ nvc0_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1332,7 +1332,7 @@ nvc1_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1366,7 +1366,7 @@ nvc3_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1400,7 +1400,7 @@ nvc4_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1435,7 +1435,7 @@ nvc8_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1470,7 +1470,7 @@ nvce_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1505,7 +1505,7 @@ nvcf_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

//	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1539,7 +1539,7 @@ nvd7_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gf119_gpio_new,

//	.i2c = gf117_i2c_new,

	.i2c = gf117_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1571,7 +1571,7 @@ nvd9_chipset = { 
	.fb = gf100_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gf119_gpio_new,

//	.i2c = gf110_i2c_new,

	.i2c = gf119_i2c_new,

//	.ibus = gf100_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gf100_ltc_new,
@@ -1605,7 +1605,7 @@ nve4_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1641,7 +1641,7 @@ nve6_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1677,7 +1677,7 @@ nve7_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1737,7 +1737,7 @@ nvf0_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1773,7 +1773,7 @@ nvf1_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gf110_i2c_new,

	.i2c = gf119_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1809,7 +1809,7 @@ nv106_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1844,7 +1844,7 @@ nv108_chipset = { 
	.fb = gk104_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gk104_i2c_new,

	.i2c = gk104_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gk104_ltc_new,
@@ -1879,7 +1879,7 @@ nv117_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gf110_i2c_new,

	.i2c = gf119_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gm107_ltc_new,
@@ -1908,7 +1908,7 @@ nv124_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gm204_i2c_new,

	.i2c = gm204_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_instmem_new,

//	.ltc = gm107_ltc_new,
@@ -1937,7 +1937,7 @@ nv126_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

//	.i2c = gm204_i2c_new,

	.i2c = gm204_i2c_new,

//	.ibus = gk104_ibus_new,

//	.imem = nv50_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
@@ -28,7 +28,6 @@ gf100_identify(struct nvkm_device *device) 
{

	switch (device->chipset) {

	case 0xc0:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -52,7 +51,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf100_pm_oclass;

		break;

	case 0xc4:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -76,7 +74,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf100_pm_oclass;

		break;

	case 0xc3:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -99,7 +96,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf100_pm_oclass;

		break;

	case 0xce:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -123,7 +119,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf100_pm_oclass;

		break;

	case 0xcf:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -146,7 +141,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf100_pm_oclass;

		break;

	case 0xc1:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -169,7 +163,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf108_pm_oclass;

		break;

	case 0xc8:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -193,7 +186,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf100_pm_oclass;

		break;

	case 0xd9:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_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;
@@ -216,7 +208,6 @@ gf100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gf117_pm_oclass;

		break;

	case 0xd7:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf117_i2c_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 −7
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ gk104_identify(struct nvkm_device *device) 
{

	switch (device->chipset) {

	case 0xe4:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_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;
@@ -53,7 +52,6 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;

		break;

	case 0xe7:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_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;
@@ -78,7 +76,6 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;

		break;

	case 0xe6:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_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;
@@ -119,7 +116,6 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_SUBDEV_PMU    ] =  gk20a_pmu_oclass;

		break;

	case 0xf0:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_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;
@@ -144,7 +140,6 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = &gk110_pm_oclass;

		break;

	case 0xf1:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_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;
@@ -169,7 +164,6 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_PM     ] = &gk110_pm_oclass;

		break;

	case 0x106:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_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;
@@ -193,7 +187,6 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		break;

	case 0x108:

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gk104_i2c_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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE