Skip to content

Commit

Permalink
drm/nvc0-/gr: remove some more of the hardcoded register writes
Browse files Browse the repository at this point in the history
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Jul 5, 2013
1 parent d196e16 commit 5c5ae71
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 28 deletions.
18 changes: 6 additions & 12 deletions drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,11 +929,13 @@ nvc0_grctx_generate_tpcid(struct nvc0_graph_priv *priv)
void
nvc0_grctx_generate_r406028(struct nvc0_graph_priv *priv)
{
u32 tmp = 0, i;
u32 tmp[GPC_MAX / 8] = {}, i = 0;
for (i = 0; i < priv->gpc_nr; i++)
tmp |= priv->tpc_nr[i] << (i * 4);
nv_wr32(priv, 0x406028, tmp);
nv_wr32(priv, 0x405870, tmp);
tmp[i / 8] |= priv->tpc_nr[i] << ((i % 8) * 4);
for (i = 0; i < 4; i++) {
nv_wr32(priv, 0x406028 + (i * 4), tmp[i]);
nv_wr32(priv, 0x405870 + (i * 4), tmp[i]);
}
}

void
Expand Down Expand Up @@ -1069,14 +1071,6 @@ nvc0_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)

nvc0_grctx_generate_tpcid(priv);
nvc0_grctx_generate_r406028(priv);

nv_wr32(priv, 0x40602c, 0x00000000);
nv_wr32(priv, 0x405874, 0x00000000);
nv_wr32(priv, 0x406030, 0x00000000);
nv_wr32(priv, 0x405878, 0x00000000);
nv_wr32(priv, 0x406034, 0x00000000);
nv_wr32(priv, 0x40587c, 0x00000000);

nvc0_grctx_generate_r4060a8(priv);
nvc0_grctx_generate_r418bb8(priv);
nvc0_grctx_generate_r406800(priv);
Expand Down
8 changes: 0 additions & 8 deletions drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,6 @@ nvd7_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)

nvc0_grctx_generate_tpcid(priv);
nvc0_grctx_generate_r406028(priv);

nv_wr32(priv, 0x40602c, 0x00000000);
nv_wr32(priv, 0x405874, 0x00000000);
nv_wr32(priv, 0x406030, 0x00000000);
nv_wr32(priv, 0x405878, 0x00000000);
nv_wr32(priv, 0x406034, 0x00000000);
nv_wr32(priv, 0x40587c, 0x00000000);

nvc0_grctx_generate_r4060a8(priv);
nve4_grctx_generate_r418bb8(priv);
nvc0_grctx_generate_r406800(priv);
Expand Down
8 changes: 0 additions & 8 deletions drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c
Original file line number Diff line number Diff line change
Expand Up @@ -937,14 +937,6 @@ nve4_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)

nvc0_grctx_generate_tpcid(priv);
nvc0_grctx_generate_r406028(priv);

nv_wr32(priv, 0x40602c, 0x00000000);
nv_wr32(priv, 0x405874, 0x00000000);
nv_wr32(priv, 0x406030, 0x00000000);
nv_wr32(priv, 0x405878, 0x00000000);
nv_wr32(priv, 0x406034, 0x00000000);
nv_wr32(priv, 0x40587c, 0x00000000);

nve4_grctx_generate_r418bb8(priv);
nvc0_grctx_generate_r406800(priv);

Expand Down

0 comments on commit 5c5ae71

Please sign in to comment.