Commit 864d37c3 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr: switch to instanced constructor 



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

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_gr *gr;

	struct nvkm_engine *ifb;

	struct nvkm_engine *me;

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

#undef NVKM_LAYOUT_ONCE



	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 **);

	int (*mpeg    )(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
@@ -31,4 +31,5 @@ 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_GR      , struct nvkm_gr      ,       gr)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

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

+40 −40
Original line number Diff line number Diff line
@@ -14,44 +14,44 @@ int nvkm_gr_ctxsw_pause(struct nvkm_device *); 
int nvkm_gr_ctxsw_resume(struct nvkm_device *);

u32 nvkm_gr_ctxsw_inst(struct nvkm_device *);



int nv04_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv10_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv15_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv17_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv20_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv25_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv2a_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv30_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv34_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv35_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv40_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv44_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv50_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int g84_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gt200_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int mcp79_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gt215_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int mcp89_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gf100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gf104_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gf108_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gf110_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gf117_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gf119_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gk104_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gk110_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gk110b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gk208_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gk20a_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gm107_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gm20b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp104_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp107_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp108_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp10b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gv100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int tu102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int nv04_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv10_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv15_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv17_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv20_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv25_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv2a_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv30_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv34_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv35_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv40_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv44_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int nv50_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int g84_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gt200_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int mcp79_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gt215_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int mcp89_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gf100_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gf104_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gf108_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gf110_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gf117_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gf119_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gk104_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gk110_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gk110b_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gk208_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gk20a_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gm107_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gm200_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gm20b_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gp100_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gp102_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gp104_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gp107_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gp108_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gp10b_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int gv100_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

int tu102_gr_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_gr **);

#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_GR      ] = "gr",

	[NVKM_ENGINE_IFB     ] = "ifb",

	[NVKM_ENGINE_ME      ] = "me",

	[NVKM_ENGINE_MPEG    ] = "mpeg",

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

+84 −85

File changed.

Preview size limit exceeded, changes collapsed.