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

drm/nouveau/bsp,vp: switch to instanced constructor 



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

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

+0 −4
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct nvkm_device { 
		struct notifier_block nb;

	} acpi;



	struct nvkm_engine *bsp;

	struct nvkm_engine *ce[9];

	struct nvkm_engine *cipher;

	struct nvkm_disp *disp;
@@ -81,7 +80,6 @@ struct nvkm_device { 
	struct nvkm_sec2 *sec2;

	struct nvkm_sw *sw;

	struct nvkm_engine *vic;

	struct nvkm_engine *vp;



#define NVKM_LAYOUT_ONCE(type,data,ptr) data *ptr;

#define NVKM_LAYOUT_INST(type,data,ptr,cnt) data *ptr[cnt];
@@ -123,7 +121,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



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

	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 **);
@@ -144,7 +141,6 @@ struct nvkm_device_chip { 
	int (*sec2    )(struct nvkm_device *, int idx, struct nvkm_sec2 **);

	int (*sw      )(struct nvkm_device *, int idx, struct nvkm_sw **);

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

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

};



struct nvkm_device *nvkm_device_find(u64 name);

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

+6 −2
Original line number Diff line number Diff line
@@ -47,8 +47,12 @@ struct nvkm_engine_func { 
	struct nvkm_sclass sclass[];

};



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

		     int index, bool enable, struct nvkm_engine *);

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

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

#define nvkm_engine_ctor_o(f,d,i,  e,s) nvkm_engine_ctor_((f),  true, (d), (i), -1 , (e), (s))

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

struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *);

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

+3 −0
Original line number Diff line number Diff line
@@ -24,3 +24,6 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ICCSENSE, struct nvkm_iccsense, iccsense) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_THERM   , struct nvkm_therm   ,    therm)

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_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

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

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
#ifndef __NVKM_BSP_H__

#define __NVKM_BSP_H__

#include <engine/xtensa.h>

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

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

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
#ifndef __NVKM_VP_H__

#define __NVKM_VP_H__

#include <engine/xtensa.h>

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

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

#endif