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

drm/nouveau/gsp: switch to instanced constructor 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 01055c01

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

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct nvkm_device { 
		struct notifier_block nb;

	} acpi;



	struct nvkm_gsp *gsp;

	struct nvkm_i2c *i2c;

	struct nvkm_subdev *ibus;

	struct nvkm_iccsense *iccsense;
@@ -138,7 +137,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*gsp     )(struct nvkm_device *, int idx, struct nvkm_gsp **);

	int (*i2c     )(struct nvkm_device *, int idx, struct nvkm_i2c **);

	int (*ibus    )(struct nvkm_device *, int idx, struct nvkm_subdev **);

	int (*iccsense)(struct nvkm_device *, int idx, struct nvkm_iccsense **);

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

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BAR , struct nvkm_bar , bar) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FAULT   , struct nvkm_fault   ,    fault)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ACR     , struct nvkm_acr     ,      acr)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_CLK     , struct nvkm_clk     ,      clk)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GSP     , struct nvkm_gsp     ,      gsp)

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

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ struct nvkm_gsp { 
	struct nvkm_falcon falcon;

};



int gv100_gsp_new(struct nvkm_device *, int, struct nvkm_gsp **);

int gv100_gsp_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_gsp **);

#endif

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { 
#include <core/layout.h>

#undef NVKM_LAYOUT_ONCE

#undef NVKM_LAYOUT_INST

	[NVKM_SUBDEV_GSP     ] = "gsp",

	[NVKM_SUBDEV_I2C     ] = "i2c",

	[NVKM_SUBDEV_IBUS    ] = "priv",

	[NVKM_SUBDEV_ICCSENSE] = "iccsense",

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

+6 −7
Original line number Diff line number Diff line
@@ -2427,7 +2427,7 @@ nv140_chipset = { 
	.fb       = { 0x00000001, gv100_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp = gv100_gsp_new,

	.gsp      = { 0x00000001, gv100_gsp_new },

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,
@@ -2471,7 +2471,7 @@ nv162_chipset = { 
	.fb       = { 0x00000001, gv100_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp = gv100_gsp_new,

	.gsp      = { 0x00000001, gv100_gsp_new },

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,
@@ -2509,7 +2509,7 @@ nv164_chipset = { 
	.fb       = { 0x00000001, gv100_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp = gv100_gsp_new,

	.gsp      = { 0x00000001, gv100_gsp_new },

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,
@@ -2548,7 +2548,7 @@ nv166_chipset = { 
	.fb       = { 0x00000001, gv100_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp = gv100_gsp_new,

	.gsp      = { 0x00000001, gv100_gsp_new },

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,
@@ -2588,7 +2588,7 @@ nv167_chipset = { 
	.fb       = { 0x00000001, gv100_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp = gv100_gsp_new,

	.gsp      = { 0x00000001, gv100_gsp_new },

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,
@@ -2626,7 +2626,7 @@ nv168_chipset = { 
	.fb       = { 0x00000001, gv100_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp = gv100_gsp_new,

	.gsp      = { 0x00000001, gv100_gsp_new },

	.i2c = gm200_i2c_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,
@@ -3248,7 +3248,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

		_(NVKM_SUBDEV_GSP     ,      gsp);

		_(NVKM_SUBDEV_I2C     ,      i2c);

		_(NVKM_SUBDEV_IBUS    ,     ibus);

		_(NVKM_SUBDEV_ICCSENSE, iccsense);