diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-03-03 10:18:56 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-03-26 08:08:11 +0400 |
| commit | 97af71fa406a347dddb59e01ac846f2ddab6bff9 (patch) | |
| tree | 0e03d6cf54ae67211322dc405db9b0f68b3537f5 /drivers/gpu/drm/nouveau/core/engine/graph/nve4.c | |
| parent | c33b1e8c63c98a400bc3ddb9e197922b64a7385e (diff) | |
| download | linux-97af71fa406a347dddb59e01ac846f2ddab6bff9.tar.xz | |
drm/gf100-/gr: split gpc state into its subunits
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/graph/nve4.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/nve4.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nve4.c b/drivers/gpu/drm/nouveau/core/engine/graph/nve4.c index cdd474c39dbc..85eb0eee6e4c 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/nve4.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve4.c @@ -81,27 +81,7 @@ nve4_graph_init_cwd_0[] = { }; static const struct nvc0_graph_init -nve4_graph_init_gpc_0[] = { - { 0x418408, 1, 0x04, 0x00000000 }, - { 0x4184a0, 3, 0x04, 0x00000000 }, - { 0x418604, 1, 0x04, 0x00000000 }, - { 0x418680, 1, 0x04, 0x00000000 }, - { 0x418714, 1, 0x04, 0x00000000 }, - { 0x418384, 1, 0x04, 0x00000000 }, - { 0x418814, 3, 0x04, 0x00000000 }, - { 0x418b04, 1, 0x04, 0x00000000 }, - { 0x4188c8, 2, 0x04, 0x00000000 }, - { 0x4188d0, 1, 0x04, 0x00010000 }, - { 0x4188d4, 1, 0x04, 0x00000001 }, - { 0x418910, 1, 0x04, 0x00010001 }, - { 0x418914, 1, 0x04, 0x00000301 }, - { 0x418918, 1, 0x04, 0x00800000 }, - { 0x418980, 1, 0x04, 0x77777770 }, - { 0x418984, 3, 0x04, 0x77777777 }, - { 0x418c04, 1, 0x04, 0x00000000 }, - { 0x418c64, 2, 0x04, 0x00000000 }, - { 0x418c88, 1, 0x04, 0x00000000 }, - { 0x418cb4, 2, 0x04, 0x00000000 }, +nve4_graph_init_gpc_unk_1[] = { { 0x418d00, 1, 0x04, 0x00000000 }, { 0x418d28, 2, 0x04, 0x00000000 }, { 0x418f00, 1, 0x04, 0x00000000 }, @@ -110,8 +90,6 @@ nve4_graph_init_gpc_0[] = { { 0x418e00, 1, 0x04, 0x00000060 }, { 0x418e08, 1, 0x04, 0x00000000 }, { 0x418e1c, 2, 0x04, 0x00000000 }, - { 0x41900c, 1, 0x04, 0x00000000 }, - { 0x419018, 1, 0x04, 0x00000000 }, {} }; @@ -175,7 +153,15 @@ nve4_graph_pack_mmio[] = { { nvc0_graph_init_scc_0 }, { nve4_graph_init_sked_0 }, { nve4_graph_init_cwd_0 }, - { nve4_graph_init_gpc_0 }, + { nvd9_graph_init_prop_0 }, + { nvc1_graph_init_gpc_unk_0 }, + { nvc0_graph_init_setup_0 }, + { nvc0_graph_init_crstr_0 }, + { nvc1_graph_init_setup_1 }, + { nvc0_graph_init_zcull_0 }, + { nvd9_graph_init_gpm_0 }, + { nve4_graph_init_gpc_unk_1 }, + { nvc0_graph_init_gcc_0 }, { nve4_graph_init_tpc_0 }, { nvd7_graph_init_ppc_0 }, { nve4_graph_init_be_0 }, |