leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/gr: add fini() hook

Browse Source 
Add a fini() hook to the GR engine. This will be used by gf100+ to
properly release the FECS and GPCCS falcons.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Alexandre Courbot
2016-12-13 17:11:28 +09:00
committed by Ben Skeggs
parent d72fb36c45
commit d2753f40a9
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c
View File

@@ -106,6 +106,15 @@ nvkm_gr_init(struct nvkm_engine *engine)
return gr->func->init(gr); return gr->func->init(gr);
} }
static int
nvkm_gr_fini(struct nvkm_engine *engine, bool suspend)
{
struct nvkm_gr *gr = nvkm_gr(engine);
if (gr->func->fini)
return gr->func->fini(gr, suspend);
return 0;
}
static void * static void *
nvkm_gr_dtor(struct nvkm_engine *engine) nvkm_gr_dtor(struct nvkm_engine *engine)
{ {
@@ -120,6 +129,7 @@ nvkm_gr = {
.dtor = nvkm_gr_dtor, .dtor = nvkm_gr_dtor,
.oneinit = nvkm_gr_oneinit, .oneinit = nvkm_gr_oneinit,
.init = nvkm_gr_init, .init = nvkm_gr_init,
.fini = nvkm_gr_fini,
.intr = nvkm_gr_intr, .intr = nvkm_gr_intr,
.tile = nvkm_gr_tile, .tile = nvkm_gr_tile,
.fifo.cclass = nvkm_gr_cclass_new, .fifo.cclass = nvkm_gr_cclass_new,

1
drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
View File

@@ -15,6 +15,7 @@ struct nvkm_gr_func {
void *(*dtor)(struct nvkm_gr *); void *(*dtor)(struct nvkm_gr *);
int (*oneinit)(struct nvkm_gr *); int (*oneinit)(struct nvkm_gr *);
int (*init)(struct nvkm_gr *); int (*init)(struct nvkm_gr *);
int (*fini)(struct nvkm_gr *, bool);
void (*intr)(struct nvkm_gr *); void (*intr)(struct nvkm_gr *);
void (*tile)(struct nvkm_gr *, int region, struct nvkm_fb_tile *); void (*tile)(struct nvkm_gr *, int region, struct nvkm_fb_tile *);
int (*tlb_flush)(struct nvkm_gr *); int (*tlb_flush)(struct nvkm_gr *);