drm/nouveau/pm/gk104: add compute signals/sources
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Fri, 19 Jun 2015 15:37:18 +0000 (17:37 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 28 Aug 2015 02:40:01 +0000 (12:40 +1000)
These signals and sources have been reverse engineered from CUPTI
(Linux). Graphics signals exposed by PerfKit (Windows only) will be
added later. I need to reverse engineer them and it's a bit painful.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c
drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c

index 40ced895bad33e0d6a33d7886591ec01ede0a9e2..d73f0ca442ebe744a49a256fb03149d035285236 100644 (file)
@@ -27,5 +27,6 @@ int gf100_pm_fini(struct nvkm_object *, bool);
 extern const struct nvkm_specdom gf100_pm_gpc[];
 
 extern const struct nvkm_specsrc gf100_pmfb_sources[];
+extern const struct nvkm_specsrc gf117_pbfb_sources[];
 
 #endif
index 911ff3f19990e20d453fdd120fbaf6cd6a58a423..01d3a485e506b9296e179e0e18936d39a5439288 100644 (file)
@@ -39,7 +39,7 @@ gf117_pmfb_sources[] = {
        {}
 };
 
-static const struct nvkm_specsrc
+const struct nvkm_specsrc
 gf117_pbfb_sources[] = {
        { 0x110100, (const struct nvkm_specmux[]) {
                        { 0x1, 0, "unk0" },
@@ -47,6 +47,12 @@ gf117_pbfb_sources[] = {
                        { 0x3, 8, "unk8" },
                        {}
                }, "pbfb0_pm_unk100" },
+        { 0x10f100, (const struct nvkm_specmux[]) {
+                       { 0x1, 0, "unk0" },
+                       { 0xf, 4, "unk4" },
+                       { 0x3, 8, "unk8" },
+                       {}
+               }, "pbfb_broadcast_pm_unk100" },
        {}
 };
 
index 7462dffa853c3d9ac194a8a76ffad617cb9741e4..5067f72b8dda92a4a154483a9f0476ca7d90bb8d 100644 (file)
  */
 #include "gf100.h"
 
+static const struct nvkm_specsrc
+gk104_pmfb_sources[] = {
+       { 0x140028, (const struct nvkm_specmux[]) {
+                       { 0x3fff, 0, "unk0" },
+                       { 0x7, 16, "unk16" },
+                       { 0x3, 24, "unk24" },
+                       { 0x2, 28, "unk28" },
+                       {}
+               }, "pmfb0_pm_unk28" },
+       { 0x14125c, (const struct nvkm_specmux[]) {
+                       { 0x3fff, 0, "unk0" },
+                       {}
+               }, "pmfb0_subp0_pm_unk25c" },
+       { 0x14165c, (const struct nvkm_specmux[]) {
+                       { 0x3fff, 0, "unk0" },
+                       {}
+               }, "pmfb0_subp1_pm_unk25c" },
+       { 0x141a5c, (const struct nvkm_specmux[]) {
+                       { 0x3fff, 0, "unk0" },
+                       {}
+               }, "pmfb0_subp2_pm_unk25c" },
+       { 0x141e5c, (const struct nvkm_specmux[]) {
+                       { 0x3fff, 0, "unk0" },
+                       {}
+               }, "pmfb0_subp3_pm_unk25c" },
+       {}
+};
+
+static const struct nvkm_specsrc
+gk104_tex_sources[] = {
+       { 0x5042c0, (const struct nvkm_specmux[]) {
+                       { 0xf, 0, "sel0", true },
+                       { 0x7, 8, "sel1", true },
+                       {}
+               }, "pgraph_gpc0_tpc0_tex_pm_mux_c_d" },
+       { 0x5042c8, (const struct nvkm_specmux[]) {
+                       { 0x1f, 0, "sel", true },
+                       {}
+               }, "pgraph_gpc0_tpc0_tex_pm_unkc8" },
+       { 0x5042b8, (const struct nvkm_specmux[]) {
+                       { 0xff, 0, "sel", true },
+                       {}
+               }, "pgraph_gpc0_tpc0_tex_pm_unkb8" },
+       {}
+};
+
 static const struct nvkm_specdom
 gk104_pm_hub[] = {
        { 0x60, (const struct nvkm_specsig[]) {
@@ -69,12 +115,51 @@ gk104_pm_gpc[] = {
                        { 0xc7, "gpc00_user_0" },
                        {}
                }, &gf100_perfctr_func },
+       { 0x20, (const struct nvkm_specsig[]) {
+                       {}
+               }, &gf100_perfctr_func },
+       { 0x20, (const struct nvkm_specsig[]) {
+                       { 0x00, "gpc02_tex_00", gk104_tex_sources },
+                       { 0x01, "gpc02_tex_01", gk104_tex_sources },
+                       { 0x02, "gpc02_tex_02", gk104_tex_sources },
+                       { 0x03, "gpc02_tex_03", gk104_tex_sources },
+                       { 0x04, "gpc02_tex_04", gk104_tex_sources },
+                       { 0x05, "gpc02_tex_05", gk104_tex_sources },
+                       { 0x06, "gpc02_tex_06", gk104_tex_sources },
+                       { 0x07, "gpc02_tex_07", gk104_tex_sources },
+                       { 0x08, "gpc02_tex_08", gk104_tex_sources },
+                       { 0x0a, "gpc02_tex_0a", gk104_tex_sources },
+                       { 0x0b, "gpc02_tex_0b", gk104_tex_sources },
+                       { 0x0d, "gpc02_tex_0c", gk104_tex_sources },
+                       { 0x0c, "gpc02_tex_0d", gk104_tex_sources },
+                       { 0x0e, "gpc02_tex_0e", gk104_tex_sources },
+                       { 0x0f, "gpc02_tex_0f", gk104_tex_sources },
+                       { 0x10, "gpc02_tex_10", gk104_tex_sources },
+                       { 0x11, "gpc02_tex_11", gk104_tex_sources },
+                       { 0x12, "gpc02_tex_12", gk104_tex_sources },
+                       {}
+               }, &gf100_perfctr_func },
        {}
 };
 
 static const struct nvkm_specdom
 gk104_pm_part[] = {
        { 0x60, (const struct nvkm_specsig[]) {
+                       { 0x00, "part00_pbfb_00", gf117_pbfb_sources },
+                       { 0x01, "part00_pbfb_01", gf117_pbfb_sources },
+                       { 0x0c, "part00_pmfb_00", gk104_pmfb_sources },
+                       { 0x0d, "part00_pmfb_01", gk104_pmfb_sources },
+                       { 0x0e, "part00_pmfb_02", gk104_pmfb_sources },
+                       { 0x0f, "part00_pmfb_03", gk104_pmfb_sources },
+                       { 0x10, "part00_pmfb_04", gk104_pmfb_sources },
+                       { 0x12, "part00_pmfb_05", gk104_pmfb_sources },
+                       { 0x15, "part00_pmfb_06", gk104_pmfb_sources },
+                       { 0x16, "part00_pmfb_07", gk104_pmfb_sources },
+                       { 0x18, "part00_pmfb_08", gk104_pmfb_sources },
+                       { 0x21, "part00_pmfb_09", gk104_pmfb_sources },
+                       { 0x25, "part00_pmfb_0a", gk104_pmfb_sources },
+                       { 0x26, "part00_pmfb_0b", gk104_pmfb_sources },
+                       { 0x27, "part00_pmfb_0c", gk104_pmfb_sources },
                        { 0x47, "part00_user_0" },
                        {}
                }, &gf100_perfctr_func },