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

drm/nouveau/flcn: rework falcon reset 



Mostly preparation to fit in Ampere changes, but should result in reset
sequences a lot closer to RM's, and perhaps help out with the issues we
sometimes see reported in this area.

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

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

+7 −3
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ 
int nvkm_falcon_ctor(const struct nvkm_falcon_func *, struct nvkm_subdev *owner,

		     const char *name, u32 addr, struct nvkm_falcon *);

void nvkm_falcon_dtor(struct nvkm_falcon *);

int nvkm_falcon_reset(struct nvkm_falcon *);



int gm200_flcn_reset_wait_mem_scrubbing(struct nvkm_falcon *);

int gm200_flcn_disable(struct nvkm_falcon *);

int gm200_flcn_enable(struct nvkm_falcon *);



int gp102_flcn_reset_eng(struct nvkm_falcon *);



void nvkm_falcon_v1_load_imem(struct nvkm_falcon *,

			      void *, u32, u32, u16, u8, bool);
@@ -15,11 +22,8 @@ int nvkm_falcon_v1_wait_for_halt(struct nvkm_falcon *, u32); 
int nvkm_falcon_v1_clear_interrupt(struct nvkm_falcon *, u32);

void nvkm_falcon_v1_set_start_addr(struct nvkm_falcon *, u32 start_addr);

void nvkm_falcon_v1_start(struct nvkm_falcon *);

int nvkm_falcon_v1_enable(struct nvkm_falcon *);

void nvkm_falcon_v1_disable(struct nvkm_falcon *);



void gp102_sec2_flcn_bind_context(struct nvkm_falcon *, struct nvkm_memory *);

int gp102_sec2_flcn_enable(struct nvkm_falcon *);



#define FLCN_PRINTK(f,l,p,fmt,a...) ({                                                          \

	if ((f)->owner->name != (f)->name)                                                      \

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

+6 −6
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ int nvkm_falcon_new_(const struct nvkm_falcon_func *, struct nvkm_device *, 
		     enum nvkm_subdev_type, int inst, bool enable, u32 addr, struct nvkm_engine **);



struct nvkm_falcon_func {

	int (*disable)(struct nvkm_falcon *);

	int (*enable)(struct nvkm_falcon *);

	bool reset_pmc;

	int (*reset_eng)(struct nvkm_falcon *);

	int (*reset_wait_mem_scrubbing)(struct nvkm_falcon *);



	struct {

		u32 *data;

		u32  size;
@@ -80,9 +86,6 @@ struct nvkm_falcon_func { 
	int (*clear_interrupt)(struct nvkm_falcon *, u32);

	void (*set_start_addr)(struct nvkm_falcon *, u32 start_addr);

	void (*start)(struct nvkm_falcon *);

	int (*enable)(struct nvkm_falcon *falcon);

	void (*disable)(struct nvkm_falcon *falcon);

	int (*reset)(struct nvkm_falcon *);



	struct {

		u32 head;
@@ -122,7 +125,4 @@ void nvkm_falcon_set_start_addr(struct nvkm_falcon *, u32); 
void nvkm_falcon_start(struct nvkm_falcon *);

int nvkm_falcon_wait_for_halt(struct nvkm_falcon *, u32);

int nvkm_falcon_clear_interrupt(struct nvkm_falcon *, u32);

int nvkm_falcon_enable(struct nvkm_falcon *);

void nvkm_falcon_disable(struct nvkm_falcon *);

int nvkm_falcon_reset(struct nvkm_falcon *);

#endif

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

+0 −8
Original line number Diff line number Diff line
@@ -2073,17 +2073,9 @@ gf100_gr_ = { 


static const struct nvkm_falcon_func

gf100_gr_flcn = {

	.fbif = 0x600,

	.load_imem = nvkm_falcon_v1_load_imem,

	.load_dmem = nvkm_falcon_v1_load_dmem,

	.read_dmem = nvkm_falcon_v1_read_dmem,

	.bind_context = nvkm_falcon_v1_bind_context,

	.wait_for_halt = nvkm_falcon_v1_wait_for_halt,

	.clear_interrupt = nvkm_falcon_v1_clear_interrupt,

	.set_start_addr = nvkm_falcon_v1_set_start_addr,

	.start = nvkm_falcon_v1_start,

	.enable = nvkm_falcon_v1_enable,

	.disable = nvkm_falcon_v1_disable,

};



int

drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c

+4 −2
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 


static const struct nvkm_falcon_func

gm107_nvdec_flcn = {

	.disable = gm200_flcn_disable,

	.enable = gm200_flcn_enable,

	.reset_pmc = true,

	.reset_wait_mem_scrubbing = gm200_flcn_reset_wait_mem_scrubbing,

	.debug = 0xd00,

	.fbif = 0x600,

	.load_imem = nvkm_falcon_v1_load_imem,
@@ -33,8 +37,6 @@ gm107_nvdec_flcn = { 
	.clear_interrupt = nvkm_falcon_v1_clear_interrupt,

	.set_start_addr = nvkm_falcon_v1_set_start_addr,

	.start = nvkm_falcon_v1_start,

	.enable = nvkm_falcon_v1_enable,

	.disable = nvkm_falcon_v1_disable,

};



static const struct nvkm_nvdec_func

drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c

+0 −11
Original line number Diff line number Diff line
@@ -24,17 +24,6 @@ 


static const struct nvkm_falcon_func

gm107_nvenc_flcn = {

	.fbif = 0x800,

	.load_imem = nvkm_falcon_v1_load_imem,

	.load_dmem = nvkm_falcon_v1_load_dmem,

	.read_dmem = nvkm_falcon_v1_read_dmem,

	.bind_context = nvkm_falcon_v1_bind_context,

	.wait_for_halt = nvkm_falcon_v1_wait_for_halt,

	.clear_interrupt = nvkm_falcon_v1_clear_interrupt,

	.set_start_addr = nvkm_falcon_v1_set_start_addr,

	.start = nvkm_falcon_v1_start,

	.enable = nvkm_falcon_v1_enable,

	.disable = nvkm_falcon_v1_disable,

};



static const struct nvkm_nvenc_func