Commit 50551b15 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ce: switch to instanced constructor 



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

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_engine *ce[9];

	struct nvkm_engine *cipher;

	struct nvkm_disp *disp;

	struct nvkm_dma *dma;
@@ -121,7 +120,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



	int (*ce[9]   )(struct nvkm_device *, int idx, struct nvkm_engine **);

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

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

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

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

+7 −2
Original line number Diff line number Diff line
@@ -53,8 +53,13 @@ int nvkm_engine_ctor_(const struct nvkm_engine_func *, bool old, struct nvkm_dev 
#define nvkm_engine_ctor_n(f,d,t,i,e,s) nvkm_engine_ctor_((f), false, (d), (t), (i), (e), (s))

#define nvkm_engine_ctor__(_1,_2,_3,_4,_5,_6,IMPL,...) IMPL

#define nvkm_engine_ctor(A...) nvkm_engine_ctor__(A, nvkm_engine_ctor_n, nvkm_engine_ctor_o)(A)

int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *,

		     int index, bool enable, struct nvkm_engine **);

int nvkm_engine_new__(const struct nvkm_engine_func *, bool old, struct nvkm_device *,

		     enum nvkm_subdev_type, int, bool enable, struct nvkm_engine **);

#define nvkm_engine_new__o(f,d,i,  e,s) nvkm_engine_new__((f),  true, (d), (i), -1 , (e), (s))

#define nvkm_engine_new__n(f,d,t,i,e,s) nvkm_engine_new__((f), false, (d), (t), (i), (e), (s))

#define nvkm_engine_new___(_1,_2,_3,_4,_5,_6,IMPL,...) IMPL

#define nvkm_engine_new_(A...) nvkm_engine_new___(A, nvkm_engine_new__n, nvkm_engine_new__o)(A)



struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *);

void nvkm_engine_unref(struct nvkm_engine **);

void nvkm_engine_tile(struct nvkm_engine *, int region);

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

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_CLK , struct nvkm_clk , clk) 
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_VP      , struct nvkm_engine  ,       vp)

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

+9 −9
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
#define __NVKM_CE_H__

#include <engine/falcon.h>



int gt215_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gf100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gm107_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp102_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gv100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int tu102_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gt215_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gf100_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gk104_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gm107_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gm200_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gp100_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gp102_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int gv100_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

int tu102_ce_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_engine **);

#endif

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

+6 −2
Original line number Diff line number Diff line
@@ -63,8 +63,12 @@ void nvkm_falcon_del(struct nvkm_falcon **); 
int nvkm_falcon_get(struct nvkm_falcon *, const struct nvkm_subdev *);

void nvkm_falcon_put(struct nvkm_falcon *, const struct nvkm_subdev *);



int nvkm_falcon_new_(const struct nvkm_falcon_func *, struct nvkm_device *,

		     int index, bool enable, u32 addr, struct nvkm_engine **);

int nvkm_falcon_new__(const struct nvkm_falcon_func *, bool old, struct nvkm_device *,

		     enum nvkm_subdev_type, int inst, bool enable, u32 addr, struct nvkm_engine **);

#define nvkm_falcon_new__o(f,d,i,  e,a,s) nvkm_falcon_new__((f),  true, (d), (i), -1 , (e), (a), (s))

#define nvkm_falcon_new__n(f,d,t,i,e,a,s) nvkm_falcon_new__((f), false, (d), (t), (i), (e), (a), (s))

#define nvkm_falcon_new___(_1,_2,_3,_4,_5,_6,_7,IMPL,...) IMPL

#define nvkm_falcon_new_(A...) nvkm_falcon_new___(A, nvkm_falcon_new__n, nvkm_falcon_new__o)(A)



struct nvkm_falcon_func {

	struct {