Commit 53e60da4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/falcon: convert to new-style nvkm_engine 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 437b2296

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

+2 −3
Original line number Diff line number Diff line
@@ -4,9 +4,8 @@ 


void gt215_ce_intr(struct nvkm_falcon *, struct nvkm_fifo_chan *);



extern struct nvkm_oclass gt215_ce_oclass;

extern struct nvkm_oclass gf100_ce0_oclass;

extern struct nvkm_oclass gf100_ce1_oclass;

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

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

extern struct nvkm_oclass gk104_ce0_oclass;

extern struct nvkm_oclass gk104_ce1_oclass;

extern struct nvkm_oclass gk104_ce2_oclass;

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

+14 −29
Original line number Diff line number Diff line
@@ -4,13 +4,9 @@ 
#include <core/engine.h>

struct nvkm_fifo_chan;



struct nvkm_falcon_data {

	bool external;

};



struct nvkm_falcon {

	struct nvkm_engine engine;

	const struct nvkm_falcon_func *func;

	struct nvkm_engine engine;



	u32 addr;

	u8  version;
@@ -32,32 +28,21 @@ struct nvkm_falcon { 
	} data;

};



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

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



struct nvkm_falcon_func {

	struct {

		u32 *data;

		u32  size;

	} code;

	struct {

		u32 *data;

		u32  size;

	} data;

	u32 pmc_enable;

	void (*init)(struct nvkm_falcon *);

	void (*intr)(struct nvkm_falcon *, struct nvkm_fifo_chan *);

	struct nvkm_sclass sclass[];

};



#define nv_falcon(priv) ((struct nvkm_falcon *)priv)



#define nvkm_falcon_create(a,p,e,c,b,d,i,f,r)                                 \

	nvkm_falcon_create_((a), (p), (e), (c), (b), (d), (i), (f),              \

			       sizeof(**r),(void **)r)

#define nvkm_falcon_destroy(p)                                              \

	nvkm_engine_destroy(&(p)->engine)

#define nvkm_falcon_init(p) ({                                              \

	struct nvkm_falcon *_falcon = (p);                                   \

	_nvkm_falcon_init(nv_object(_falcon));                               \

})

#define nvkm_falcon_fini(p,s) ({                                            \

	struct nvkm_falcon *_falcon = (p);                                   \

	_nvkm_falcon_fini(nv_object(_falcon), (s));                          \

})



int nvkm_falcon_create_(const struct nvkm_falcon_func *,

			struct nvkm_object *, struct nvkm_object *,

			struct nvkm_oclass *, u32, bool, const char *,

			const char *, int, void **);

#define _nvkm_falcon_dtor _nvkm_engine_dtor

int  _nvkm_falcon_init(struct nvkm_object *);

int  _nvkm_falcon_fini(struct nvkm_object *, bool);

#endif

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

+5 −4
Original line number Diff line number Diff line 
#ifndef __NVKM_MSPDEC_H__

#define __NVKM_MSPDEC_H__

#include <core/engine.h>

extern struct nvkm_oclass g98_mspdec_oclass;

extern struct nvkm_oclass gf100_mspdec_oclass;

extern struct nvkm_oclass gk104_mspdec_oclass;

#include <engine/falcon.h>

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

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

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

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

#endif

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

+4 −3
Original line number Diff line number Diff line 
#ifndef __NVKM_MSPPP_H__

#define __NVKM_MSPPP_H__

#include <core/engine.h>

extern struct nvkm_oclass g98_msppp_oclass;

extern struct nvkm_oclass gf100_msppp_oclass;

#include <engine/falcon.h>

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

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

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

#endif

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

+6 −4
Original line number Diff line number Diff line 
#ifndef __NVKM_MSVLD_H__

#define __NVKM_MSVLD_H__

#include <core/engine.h>

extern struct nvkm_oclass g98_msvld_oclass;

extern struct nvkm_oclass gf100_msvld_oclass;

extern struct nvkm_oclass gk104_msvld_oclass;

#include <engine/falcon.h>

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

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

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

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

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

#endif