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

drm/nouveau/fifo: switch to instanced constructor 



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

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_fifo *fifo;

	struct nvkm_gr *gr;

	struct nvkm_engine *ifb;

	struct nvkm_engine *me;
@@ -117,7 +116,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



	int (*fifo    )(struct nvkm_device *, int idx, struct nvkm_fifo **);

	int (*gr      )(struct nvkm_device *, int idx, struct nvkm_gr **);

	int (*ifb     )(struct nvkm_device *, int idx, struct nvkm_engine **);

	int (*me      )(struct nvkm_device *, int idx, struct nvkm_engine **);

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

+1 −0
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ NVKM_LAYOUT_INST(NVKM_ENGINE_CE , struct nvkm_engine , ce, 9) 
NVKM_LAYOUT_ONCE(NVKM_ENGINE_CIPHER  , struct nvkm_engine  ,   cipher)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_DISP    , struct nvkm_disp    ,     disp)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_DMAOBJ  , struct nvkm_dma     ,      dma)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_FIFO    , struct nvkm_fifo    ,     fifo)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

+18 −18
Original line number Diff line number Diff line
@@ -58,22 +58,22 @@ nvkm_fifo_chan_inst(struct nvkm_fifo *, u64 inst, unsigned long *flags); 
struct nvkm_fifo_chan *

nvkm_fifo_chan_chid(struct nvkm_fifo *, int chid, unsigned long *flags);



int nv04_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int nv10_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int nv17_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int nv40_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int nv50_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int g84_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gf100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk104_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk110_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk208_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gk20a_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm107_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp10b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gv100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int tu102_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int nv04_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int nv10_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int nv17_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int nv40_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int nv50_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int g84_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gf100_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gk104_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gk110_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gk208_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gk20a_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gm107_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gm200_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gm20b_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gp100_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gp10b_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int gv100_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

int tu102_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);

#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_ENGINE_FIFO    ] = "fifo",

	[NVKM_ENGINE_GR      ] = "gr",

	[NVKM_ENGINE_IFB     ] = "ifb",

	[NVKM_ENGINE_ME      ] = "me",

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

+83 −84

File changed.

Preview size limit exceeded, changes collapsed.