drm/nouveau/gr/gf100-: virtualise init_400054
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
6df6d2b95e
commit
04547482ae
|
@ -1914,6 +1914,12 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
gf100_gr_init_400054(struct gf100_gr *gr)
|
||||||
|
{
|
||||||
|
nvkm_wr32(gr->base.engine.subdev.device, 0x400054, 0x34ce3464);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
gf100_gr_init_shader_exceptions(struct gf100_gr *gr, int gpc, int tpc)
|
gf100_gr_init_shader_exceptions(struct gf100_gr *gr, int gpc, int tpc)
|
||||||
{
|
{
|
||||||
|
@ -2122,7 +2128,8 @@ gf100_gr_init(struct gf100_gr *gr)
|
||||||
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
||||||
nvkm_wr32(device, 0x400134, 0xffffffff);
|
nvkm_wr32(device, 0x400134, 0xffffffff);
|
||||||
|
|
||||||
nvkm_wr32(device, 0x400054, 0x34ce3464);
|
if (gr->func->init_400054)
|
||||||
|
gr->func->init_400054(gr);
|
||||||
|
|
||||||
gf100_gr_zbc_init(gr);
|
gf100_gr_zbc_init(gr);
|
||||||
|
|
||||||
|
@ -2162,6 +2169,7 @@ gf100_gr = {
|
||||||
.init_419eb4 = gf100_gr_init_419eb4,
|
.init_419eb4 = gf100_gr_init_419eb4,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gf100_gr_pack_mmio,
|
.mmio = gf100_gr_pack_mmio,
|
||||||
.fecs.ucode = &gf100_gr_fecs_ucode,
|
.fecs.ucode = &gf100_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
||||||
|
|
|
@ -141,6 +141,7 @@ struct gf100_gr_func {
|
||||||
void (*init_tex_hww_esr)(struct gf100_gr *, int gpc, int tpc);
|
void (*init_tex_hww_esr)(struct gf100_gr *, int gpc, int tpc);
|
||||||
void (*init_504430)(struct gf100_gr *, int gpc, int tpc);
|
void (*init_504430)(struct gf100_gr *, int gpc, int tpc);
|
||||||
void (*init_shader_exceptions)(struct gf100_gr *, int gpc, int tpc);
|
void (*init_shader_exceptions)(struct gf100_gr *, int gpc, int tpc);
|
||||||
|
void (*init_400054)(struct gf100_gr *);
|
||||||
void (*set_hww_esr_report_mask)(struct gf100_gr *);
|
void (*set_hww_esr_report_mask)(struct gf100_gr *);
|
||||||
const struct gf100_gr_pack *mmio;
|
const struct gf100_gr_pack *mmio;
|
||||||
struct {
|
struct {
|
||||||
|
@ -167,6 +168,7 @@ void gf100_gr_init_419cc0(struct gf100_gr *);
|
||||||
void gf100_gr_init_419eb4(struct gf100_gr *);
|
void gf100_gr_init_419eb4(struct gf100_gr *);
|
||||||
void gf100_gr_init_tex_hww_esr(struct gf100_gr *, int, int);
|
void gf100_gr_init_tex_hww_esr(struct gf100_gr *, int, int);
|
||||||
void gf100_gr_init_shader_exceptions(struct gf100_gr *, int, int);
|
void gf100_gr_init_shader_exceptions(struct gf100_gr *, int, int);
|
||||||
|
void gf100_gr_init_400054(struct gf100_gr *);
|
||||||
|
|
||||||
void gf117_gr_init_zcull(struct gf100_gr *);
|
void gf117_gr_init_zcull(struct gf100_gr *);
|
||||||
|
|
||||||
|
@ -180,6 +182,7 @@ void gk110_gr_init_419eb4(struct gf100_gr *);
|
||||||
|
|
||||||
void gm107_gr_init_504430(struct gf100_gr *, int, int);
|
void gm107_gr_init_504430(struct gf100_gr *, int, int);
|
||||||
void gm107_gr_init_shader_exceptions(struct gf100_gr *, int, int);
|
void gm107_gr_init_shader_exceptions(struct gf100_gr *, int, int);
|
||||||
|
void gm107_gr_init_400054(struct gf100_gr *);
|
||||||
|
|
||||||
int gk20a_gr_init(struct gf100_gr *);
|
int gk20a_gr_init(struct gf100_gr *);
|
||||||
|
|
||||||
|
|
|
@ -125,6 +125,7 @@ gf104_gr = {
|
||||||
.init_419eb4 = gf100_gr_init_419eb4,
|
.init_419eb4 = gf100_gr_init_419eb4,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gf104_gr_pack_mmio,
|
.mmio = gf104_gr_pack_mmio,
|
||||||
.fecs.ucode = &gf100_gr_fecs_ucode,
|
.fecs.ucode = &gf100_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
||||||
|
|
|
@ -123,6 +123,7 @@ gf108_gr = {
|
||||||
.init_419eb4 = gf100_gr_init_419eb4,
|
.init_419eb4 = gf100_gr_init_419eb4,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gf108_gr_pack_mmio,
|
.mmio = gf108_gr_pack_mmio,
|
||||||
.fecs.ucode = &gf100_gr_fecs_ucode,
|
.fecs.ucode = &gf100_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
||||||
|
|
|
@ -97,6 +97,7 @@ gf110_gr = {
|
||||||
.init_419eb4 = gf100_gr_init_419eb4,
|
.init_419eb4 = gf100_gr_init_419eb4,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gf110_gr_pack_mmio,
|
.mmio = gf110_gr_pack_mmio,
|
||||||
.fecs.ucode = &gf100_gr_fecs_ucode,
|
.fecs.ucode = &gf100_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
||||||
|
|
|
@ -161,6 +161,7 @@ gf117_gr = {
|
||||||
.init_419eb4 = gf100_gr_init_419eb4,
|
.init_419eb4 = gf100_gr_init_419eb4,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gf117_gr_pack_mmio,
|
.mmio = gf117_gr_pack_mmio,
|
||||||
.fecs.ucode = &gf117_gr_fecs_ucode,
|
.fecs.ucode = &gf117_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gf117_gr_gpccs_ucode,
|
.gpccs.ucode = &gf117_gr_gpccs_ucode,
|
||||||
|
|
|
@ -188,6 +188,7 @@ gf119_gr = {
|
||||||
.init_419eb4 = gf100_gr_init_419eb4,
|
.init_419eb4 = gf100_gr_init_419eb4,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gf119_gr_pack_mmio,
|
.mmio = gf119_gr_pack_mmio,
|
||||||
.fecs.ucode = &gf100_gr_fecs_ucode,
|
.fecs.ucode = &gf100_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
.gpccs.ucode = &gf100_gr_gpccs_ucode,
|
||||||
|
|
|
@ -495,7 +495,7 @@ gk104_gr_init(struct gf100_gr *gr)
|
||||||
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
||||||
nvkm_wr32(device, 0x400134, 0xffffffff);
|
nvkm_wr32(device, 0x400134, 0xffffffff);
|
||||||
|
|
||||||
nvkm_wr32(device, 0x400054, 0x34ce3464);
|
gr->func->init_400054(gr);
|
||||||
|
|
||||||
gf100_gr_zbc_init(gr);
|
gf100_gr_zbc_init(gr);
|
||||||
|
|
||||||
|
@ -537,6 +537,7 @@ gk104_gr = {
|
||||||
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gk104_gr_pack_mmio,
|
.mmio = gk104_gr_pack_mmio,
|
||||||
.fecs.ucode = &gk104_gr_fecs_ucode,
|
.fecs.ucode = &gk104_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gk104_gr_gpccs_ucode,
|
.gpccs.ucode = &gk104_gr_gpccs_ucode,
|
||||||
|
|
|
@ -363,6 +363,7 @@ gk110_gr = {
|
||||||
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gk110_gr_pack_mmio,
|
.mmio = gk110_gr_pack_mmio,
|
||||||
.fecs.ucode = &gk110_gr_fecs_ucode,
|
.fecs.ucode = &gk110_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gk110_gr_gpccs_ucode,
|
.gpccs.ucode = &gk110_gr_gpccs_ucode,
|
||||||
|
|
|
@ -115,6 +115,7 @@ gk110b_gr = {
|
||||||
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gk110b_gr_pack_mmio,
|
.mmio = gk110b_gr_pack_mmio,
|
||||||
.fecs.ucode = &gk110_gr_fecs_ucode,
|
.fecs.ucode = &gk110_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gk110_gr_gpccs_ucode,
|
.gpccs.ucode = &gk110_gr_gpccs_ucode,
|
||||||
|
|
|
@ -173,6 +173,7 @@ gk208_gr = {
|
||||||
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
.init_shader_exceptions = gf100_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gf100_gr_init_400054,
|
||||||
.mmio = gk208_gr_pack_mmio,
|
.mmio = gk208_gr_pack_mmio,
|
||||||
.fecs.ucode = &gk208_gr_fecs_ucode,
|
.fecs.ucode = &gk208_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gk208_gr_gpccs_ucode,
|
.gpccs.ucode = &gk208_gr_gpccs_ucode,
|
||||||
|
|
|
@ -281,6 +281,12 @@ gm107_gr_pack_mmio[] = {
|
||||||
* PGRAPH engine/subdev functions
|
* PGRAPH engine/subdev functions
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
|
void
|
||||||
|
gm107_gr_init_400054(struct gf100_gr *gr)
|
||||||
|
{
|
||||||
|
nvkm_wr32(gr->base.engine.subdev.device, 0x400054, 0x2c350f63);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
gm107_gr_init_shader_exceptions(struct gf100_gr *gr, int gpc, int tpc)
|
gm107_gr_init_shader_exceptions(struct gf100_gr *gr, int gpc, int tpc)
|
||||||
{
|
{
|
||||||
|
@ -431,7 +437,7 @@ gm107_gr_init(struct gf100_gr *gr)
|
||||||
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
||||||
nvkm_wr32(device, 0x400134, 0xffffffff);
|
nvkm_wr32(device, 0x400134, 0xffffffff);
|
||||||
|
|
||||||
nvkm_wr32(device, 0x400054, 0x2c350f63);
|
gr->func->init_400054(gr);
|
||||||
|
|
||||||
gf100_gr_zbc_init(gr);
|
gf100_gr_zbc_init(gr);
|
||||||
|
|
||||||
|
@ -475,6 +481,7 @@ gm107_gr = {
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_504430 = gm107_gr_init_504430,
|
.init_504430 = gm107_gr_init_504430,
|
||||||
.init_shader_exceptions = gm107_gr_init_shader_exceptions,
|
.init_shader_exceptions = gm107_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gm107_gr_init_400054,
|
||||||
.mmio = gm107_gr_pack_mmio,
|
.mmio = gm107_gr_pack_mmio,
|
||||||
.fecs.ucode = &gm107_gr_fecs_ucode,
|
.fecs.ucode = &gm107_gr_fecs_ucode,
|
||||||
.gpccs.ucode = &gm107_gr_gpccs_ucode,
|
.gpccs.ucode = &gm107_gr_gpccs_ucode,
|
||||||
|
|
|
@ -144,7 +144,7 @@ gm200_gr_init(struct gf100_gr *gr)
|
||||||
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
nvkm_wr32(device, 0x40011c, 0xffffffff);
|
||||||
nvkm_wr32(device, 0x400134, 0xffffffff);
|
nvkm_wr32(device, 0x400134, 0xffffffff);
|
||||||
|
|
||||||
nvkm_wr32(device, 0x400054, 0x2c350f63);
|
gr->func->init_400054(gr);
|
||||||
|
|
||||||
gf100_gr_zbc_init(gr);
|
gf100_gr_zbc_init(gr);
|
||||||
|
|
||||||
|
@ -206,6 +206,7 @@ gm200_gr = {
|
||||||
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,
|
||||||
.init_504430 = gm107_gr_init_504430,
|
.init_504430 = gm107_gr_init_504430,
|
||||||
.init_shader_exceptions = gm107_gr_init_shader_exceptions,
|
.init_shader_exceptions = gm107_gr_init_shader_exceptions,
|
||||||
|
.init_400054 = gm107_gr_init_400054,
|
||||||
.rops = gm200_gr_rops,
|
.rops = gm200_gr_rops,
|
||||||
.ppc_nr = 2,
|
.ppc_nr = 2,
|
||||||
.grctx = &gm200_grctx,
|
.grctx = &gm200_grctx,
|
||||||
|
|
Loading…
Reference in New Issue