Commit 09f409d7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/dma: switch to instanced constructor 



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

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_dma *dma;

	struct nvkm_fifo *fifo;

	struct nvkm_gr *gr;

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

#undef NVKM_LAYOUT_ONCE



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

	int (*ifb     )(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
@@ -29,4 +29,5 @@ 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_DMAOBJ  , struct nvkm_dma     ,      dma)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

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

+5 −5
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ struct nvkm_dma { 


struct nvkm_dmaobj *nvkm_dmaobj_search(struct nvkm_client *, u64 object);



int nv04_dma_new(struct nvkm_device *, int, struct nvkm_dma **);

int nv50_dma_new(struct nvkm_device *, int, struct nvkm_dma **);

int gf100_dma_new(struct nvkm_device *, int, struct nvkm_dma **);

int gf119_dma_new(struct nvkm_device *, int, struct nvkm_dma **);

int gv100_dma_new(struct nvkm_device *, int, struct nvkm_dma **);

int nv04_dma_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_dma **);

int nv50_dma_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_dma **);

int gf100_dma_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_dma **);

int gf119_dma_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_dma **);

int gv100_dma_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_dma **);

#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_DMAOBJ  ] = "dma",

	[NVKM_ENGINE_FIFO    ] = "fifo",

	[NVKM_ENGINE_GR      ] = "gr",

	[NVKM_ENGINE_IFB     ] = "ifb",

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

+86 −87

File changed.

Preview size limit exceeded, changes collapsed.