p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/nouveau/gr/gf100-: virtualise init_419c9c + apply fixes from traces 

Deliberately removed from non-GP100, as RM doesn't touch it.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:46 +10:00
parent 0a84a51334
commit 778f18c607
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
View File

@ -2068,6 +2068,8 @@ gf100_gr_init(struct gf100_gr *gr)
gr->func->init_419cc0(gr);
if (gr->func->init_419eb4)
gr->func->init_419eb4(gr);
if (gr->func->init_419c9c)
gr->func->init_419c9c(gr);
for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
nvkm_wr32(device, GPC_UNIT(gpc, 0x0420), 0xc0000000);

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

@ -136,6 +136,7 @@ struct gf100_gr_func {
void (*init_sked_hww_esr)(struct gf100_gr *);
void (*init_419cc0)(struct gf100_gr *);
void (*init_419eb4)(struct gf100_gr *);
void (*init_419c9c)(struct gf100_gr *);
void (*init_ppc_exceptions)(struct gf100_gr *);
void (*set_hww_esr_report_mask)(struct gf100_gr *);
const struct gf100_gr_pack *mmio;

14
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
View File

@ -30,6 +30,14 @@
* PGRAPH engine/subdev functions
******************************************************************************/
static void
gp100_gr_init_419c9c(struct gf100_gr *gr)
{
struct nvkm_device *device = gr->base.engine.subdev.device;
nvkm_mask(device, 0x419c9c, 0x00010000, 0x00010000);
nvkm_mask(device, 0x419c9c, 0x00020000, 0x00020000);
}
void
gp100_gr_init_fecs_exceptions(struct gf100_gr *gr)
{
@ -80,9 +88,8 @@ gp100_gr_init(struct gf100_gr *gr)
nvkm_wr32(device, 0x405840, 0xc0000000);
nvkm_wr32(device, 0x405844, 0x00ffffff);
gr->func->init_419cc0(gr);
nvkm_mask(device, 0x419c9c, 0x00010000, 0x00010000);
nvkm_mask(device, 0x419c9c, 0x00020000, 0x00020000);
if (gr->func->init_419c9c)
gr->func->init_419c9c(gr);
gr->func->init_ppc_exceptions(gr);
@ -135,6 +142,7 @@ gp100_gr = {
.init_ds_hww_esr_2 = gm200_gr_init_ds_hww_esr_2,
.init_sked_hww_esr = gk104_gr_init_sked_hww_esr,
.init_419cc0 = gf100_gr_init_419cc0,
.init_419c9c = gp100_gr_init_419c9c,
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
.rops = gm200_gr_rops,
.ppc_nr = 2,