redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau/gr/gf100-: virtualise r405a14 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
hifive-unleashed-5.1
Ben Skeggs 2018-05-08 20:39:46 +10:00
parent 6f63a5fb1e
commit 8b058ca518
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1946,6 +1946,9 @@ gf100_gr_init(struct gf100_gr *gr)
else
gf100_gr_mmio(gr, gr->func->mmio);
if (gr->func->init_r405a14)
gr->func->init_r405a14(gr);
nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));

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

@ -122,6 +122,7 @@ struct gf100_gr_func {
void (*dtor)(struct gf100_gr *);
int (*init)(struct gf100_gr *);
void (*init_gpc_mmu)(struct gf100_gr *);
void (*init_r405a14)(struct gf100_gr *);
void (*init_rop_active_fbps)(struct gf100_gr *);
void (*init_ppc_exceptions)(struct gf100_gr *);
void (*init_swdx_pes_mask)(struct gf100_gr *);

7
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
View File

@ -103,10 +103,17 @@ gf108_gr_pack_mmio[] = {
* PGRAPH engine/subdev functions
******************************************************************************/
static void
gf108_gr_init_r405a14(struct gf100_gr *gr)
{
nvkm_wr32(gr->base.engine.subdev.device, 0x405a14, 0x80000000);
}
static const struct gf100_gr_func
gf108_gr = {
.init = gf100_gr_init,
.init_gpc_mmu = gf100_gr_init_gpc_mmu,
.init_r405a14 = gf108_gr_init_r405a14,
.mmio = gf108_gr_pack_mmio,
.fecs.ucode = &gf100_gr_fecs_ucode,
.gpccs.ucode = &gf100_gr_gpccs_ucode,