diff options
author | Ben Skeggs | 2014-03-03 07:18:56 +0100 |
---|---|---|
committer | Ben Skeggs | 2014-03-26 05:08:12 +0100 |
commit | 7e1945334981e23e265ee208cd3da0de60f3bcfe (patch) | |
tree | a53975448575dd3a2d6f1e8cea40d810209f72ef /drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c | |
parent | drm/gf100-/gr: split gpc state into its subunits (diff) | |
download | kernel-qcow2-linux-7e1945334981e23e265ee208cd3da0de60f3bcfe.tar.gz kernel-qcow2-linux-7e1945334981e23e265ee208cd3da0de60f3bcfe.tar.xz kernel-qcow2-linux-7e1945334981e23e265ee208cd3da0de60f3bcfe.zip |
drm/gf100-/gf: split tpc state into its subunits
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c index 0441fe40f4c7..126dbe27ed45 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c @@ -751,10 +751,7 @@ nve4_grctx_pack_gpc[] = { }; static const struct nvc0_graph_init -nve4_grctx_init_tpc_0[] = { - { 0x419848, 1, 0x04, 0x00000000 }, - { 0x419864, 1, 0x04, 0x00000129 }, - { 0x419888, 1, 0x04, 0x00000000 }, +nve4_grctx_init_tex_0[] = { { 0x419a00, 1, 0x04, 0x000000f0 }, { 0x419a04, 1, 0x04, 0x00000001 }, { 0x419a08, 1, 0x04, 0x00000021 }, @@ -765,14 +762,29 @@ nve4_grctx_init_tpc_0[] = { { 0x419a20, 1, 0x04, 0x00000800 }, { 0x419a30, 1, 0x04, 0x00000001 }, { 0x419ac4, 1, 0x04, 0x0037f440 }, + {} +}; + +static const struct nvc0_graph_init +nve4_grctx_init_mpc_0[] = { { 0x419c00, 1, 0x04, 0x0000000a }, { 0x419c04, 1, 0x04, 0x80000006 }, { 0x419c08, 1, 0x04, 0x00000002 }, { 0x419c20, 1, 0x04, 0x00000000 }, { 0x419c24, 1, 0x04, 0x00084210 }, { 0x419c28, 1, 0x04, 0x3efbefbe }, + {} +}; + +static const struct nvc0_graph_init +nve4_grctx_init_l1c_0[] = { { 0x419ce8, 1, 0x04, 0x00000000 }, { 0x419cf4, 1, 0x04, 0x00003203 }, + {} +}; + +static const struct nvc0_graph_init +nve4_grctx_init_sm_0[] = { { 0x419e04, 3, 0x04, 0x00000000 }, { 0x419e10, 1, 0x04, 0x00000402 }, { 0x419e44, 1, 0x04, 0x0013eff2 }, @@ -792,7 +804,11 @@ nve4_grctx_init_tpc_0[] = { static const struct nvc0_graph_pack nve4_grctx_pack_tpc[] = { - { nve4_grctx_init_tpc_0 }, + { nvd7_grctx_init_pe_0 }, + { nve4_grctx_init_tex_0 }, + { nve4_grctx_init_mpc_0 }, + { nve4_grctx_init_l1c_0 }, + { nve4_grctx_init_sm_0 }, {} }; |