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

drm/nouveau/disp: switch to instanced constructor 



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

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_disp *disp;

	struct nvkm_dma *dma;

	struct nvkm_fifo *fifo;

	struct nvkm_gr *gr;
@@ -119,7 +118,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



	int (*disp    )(struct nvkm_device *, int idx, struct nvkm_disp **);

	int (*dma     )(struct nvkm_device *, int idx, struct nvkm_dma **);

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -28,4 +28,5 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GSP , struct nvkm_gsp , gsp) 
NVKM_LAYOUT_ONCE(NVKM_ENGINE_BSP     , struct nvkm_engine  ,      bsp)

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_VP      , struct nvkm_engine  ,       vp)

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

+18 −18
Original line number Diff line number Diff line
@@ -23,22 +23,22 @@ struct nvkm_disp { 
	} client;

};



int nv04_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int nv50_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int g84_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gt200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int g94_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int mcp77_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gt215_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int mcp89_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gf119_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gk104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gm107_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gm200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gp100_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gp102_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gv100_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int tu102_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int ga102_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int nv04_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int nv50_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int g84_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gt200_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int g94_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int mcp77_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gt215_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int mcp89_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gf119_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gk104_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gk110_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gm107_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gm200_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gp100_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gp102_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int gv100_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int tu102_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

int ga102_disp_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_disp **);

#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_DISP    ] = "disp",

	[NVKM_ENGINE_DMAOBJ  ] = "dma",

	[NVKM_ENGINE_FIFO    ] = "fifo",

	[NVKM_ENGINE_GR      ] = "gr",

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

+83 −84

File changed.

Preview size limit exceeded, changes collapsed.