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

drm/nouveau/instmem: switch to instanced constructor 



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

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_instmem *imem;

	struct nvkm_ltc *ltc;

	struct nvkm_mc *mc;

	struct nvkm_mmu *mmu;
@@ -134,7 +133,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*imem    )(struct nvkm_device *, int idx, struct nvkm_instmem **);

	int (*ltc     )(struct nvkm_device *, int idx, struct nvkm_ltc **);

	int (*mc      )(struct nvkm_device *, int idx, struct nvkm_mc **);

	int (*mmu     )(struct nvkm_device *, int idx, struct nvkm_mmu **);

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GPIO , struct nvkm_gpio , gpio) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_I2C     , struct nvkm_i2c     ,      i2c)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FUSE    , struct nvkm_fuse    ,     fuse)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BUS     , struct nvkm_bus     ,      bus)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_INSTMEM , struct nvkm_instmem ,     imem)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FB      , struct nvkm_fb      ,       fb)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BAR     , struct nvkm_bar     ,      bar)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FAULT   , struct nvkm_fault   ,    fault)

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

+4 −4
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ int nvkm_instobj_new(struct nvkm_instmem *, u32 size, u32 align, bool zero, 
		     struct nvkm_memory **);





int nv04_instmem_new(struct nvkm_device *, int, struct nvkm_instmem **);

int nv40_instmem_new(struct nvkm_device *, int, struct nvkm_instmem **);

int nv50_instmem_new(struct nvkm_device *, int, struct nvkm_instmem **);

int gk20a_instmem_new(struct nvkm_device *, int, struct nvkm_instmem **);

int nv04_instmem_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_instmem **);

int nv40_instmem_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_instmem **);

int nv50_instmem_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_instmem **);

int gk20a_instmem_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_instmem **);

#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_INSTMEM ] = "imem",

	[NVKM_SUBDEV_LTC     ] = "ltc",

	[NVKM_SUBDEV_MC      ] = "mc",

	[NVKM_SUBDEV_MMU     ] = "mmu",

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

+87 −88

File changed.

Preview size limit exceeded, changes collapsed.