drm/nouveau/top/gk104: initial implementation

Ported from the code currently in engine/fifo/gk104.c.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
index 5839ac748c5463431e1b8562969541c143a92351..8fb575a92c48f69336b844eb09575fbfcc73beb5 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
@@ -12,4 +12,6 @@ u32 nvkm_top_reset(struct nvkm_top *, enum nvkm_devidx);
 u32 nvkm_top_intr(struct nvkm_top *, u32 intr, u64 *subdevs);
 enum nvkm_devidx nvkm_top_fault(struct nvkm_top *, int fault);
 enum nvkm_devidx nvkm_top_engine(struct nvkm_top *, int, int *runl, int *engn);
+
+int gk104_top_new(struct nvkm_device *, int, struct nvkm_top **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index e3cb8e526b900e08e6f53df89f1c332d45cba661..65d4ab9a8cb8f6f5334492fc445f8ee9968e21b8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -1683,6 +1683,7 @@ nve4_chipset = {
        .pmu = gk104_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1721,6 +1722,7 @@ nve6_chipset = {
        .pmu = gk104_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1759,6 +1761,7 @@ nve7_chipset = {
        .pmu = gk104_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1789,6 +1792,7 @@ nvea_chipset = {
        .mmu = gf100_mmu_new,
        .pmu = gk20a_pmu_new,
        .timer = gk20a_timer_new,
+       .top = gk104_top_new,
        .volt = gk20a_volt_new,
        .ce[2] = gk104_ce_new,
        .dma = gf119_dma_new,
@@ -1821,6 +1825,7 @@ nvf0_chipset = {
        .pmu = gk110_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1858,6 +1863,7 @@ nvf1_chipset = {
        .pmu = gk110_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1895,6 +1901,7 @@ nv106_chipset = {
        .pmu = gk208_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1932,6 +1939,7 @@ nv108_chipset = {
        .pmu = gk208_pmu_new,
        .therm = gf119_therm_new,
        .timer = nv41_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gk104_ce_new,
        .ce[1] = gk104_ce_new,
@@ -1969,6 +1977,7 @@ nv117_chipset = {
        .pmu = gm107_pmu_new,
        .therm = gm107_therm_new,
        .timer = gk20a_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gm107_ce_new,
        .ce[2] = gm107_ce_new,
@@ -2001,6 +2010,7 @@ nv120_chipset = {
        .pmu = gm107_pmu_new,
        .secboot = gm200_secboot_new,
        .timer = gk20a_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gm200_ce_new,
        .ce[1] = gm200_ce_new,
@@ -2034,6 +2044,7 @@ nv124_chipset = {
        .pmu = gm107_pmu_new,
        .secboot = gm200_secboot_new,
        .timer = gk20a_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gm200_ce_new,
        .ce[1] = gm200_ce_new,
@@ -2067,6 +2078,7 @@ nv126_chipset = {
        .pmu = gm107_pmu_new,
        .secboot = gm200_secboot_new,
        .timer = gk20a_timer_new,
+       .top = gk104_top_new,
        .volt = gk104_volt_new,
        .ce[0] = gm200_ce_new,
        .ce[1] = gm200_ce_new,
@@ -2093,6 +2105,7 @@ nv12b_chipset = {
        .mmu = gf100_mmu_new,
        .secboot = gm20b_secboot_new,
        .timer = gk20a_timer_new,
+       .top = gk104_top_new,
        .ce[2] = gm200_ce_new,
        .volt = gm20b_volt_new,
        .dma = gf119_dma_new,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
index 477ce36d60eae15d700a5ade7ac09bb3c1091fab..1078401cdcea4e1e3a14f5fbcbe3c9b5674395d2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
@@ -1 +1,2 @@
 nvkm-y += nvkm/subdev/top/base.o
+nvkm-y += nvkm/subdev/top/gk104.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
new file mode 100644 (file)
index 0000000..e06acc3
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2016 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs <bskeggs@redhat.com>
+ */
+#include "priv.h"
+
+static int
+gk104_top_oneinit(struct nvkm_top *top)
+{
+       struct nvkm_subdev *subdev = &top->subdev;
+       struct nvkm_device *device = subdev->device;
+       struct nvkm_top_device *info = NULL;
+       u32 data, type;
+       int i;
+
+       for (i = 0; i < 64; i++) {
+               if (!info) {
+                       if (!(info = nvkm_top_device_new(top)))
+                               return -ENOMEM;
+                       type = ~0;
+               }
+
+               data = nvkm_rd32(device, 0x022700 + (i * 0x04));
+               nvkm_trace(subdev, "%02x: %08x\n", i, data);
+               switch (data & 0x00000003) {
+               case 0x00000000: /* NOT_VALID */
+                       continue;
+               case 0x00000001: /* DATA */
+                       info->addr  = (data & 0x00fff000);
+                       info->fault = (data & 0x000000f8) >> 3;
+                       break;
+               case 0x00000002: /* ENUM */
+                       if (data & 0x00000020)
+                               info->engine  = (data & 0x3c000000) >> 26;
+                       if (data & 0x00000010)
+                               info->runlist = (data & 0x01e00000) >> 21;
+                       if (data & 0x00000008)
+                               info->intr    = (data & 0x000f8000) >> 15;
+                       if (data & 0x00000004)
+                               info->reset   = (data & 0x00003e00) >> 9;
+                       break;
+               case 0x00000003: /* ENGINE_TYPE */
+                       type = (data & 0x7ffffffc) >> 2;
+                       break;
+               }
+
+               if (data & 0x80000000)
+                       continue;
+
+               /* Translate engine type to NVKM engine identifier. */
+               switch (type) {
+               case 0x00000000: info->index = NVKM_ENGINE_GR; break;
+               case 0x00000001: info->index = NVKM_ENGINE_CE0; break;
+               case 0x00000002: info->index = NVKM_ENGINE_CE1; break;
+               case 0x00000003: info->index = NVKM_ENGINE_CE2; break;
+               case 0x00000008: info->index = NVKM_ENGINE_MSPDEC; break;
+               case 0x00000009: info->index = NVKM_ENGINE_MSPPP; break;
+               case 0x0000000a: info->index = NVKM_ENGINE_MSVLD; break;
+               case 0x0000000b: info->index = NVKM_ENGINE_MSENC; break;
+               case 0x0000000c: info->index = NVKM_ENGINE_VIC; break;
+               case 0x0000000d: info->index = NVKM_ENGINE_SEC; break;
+               case 0x0000000e: info->index = NVKM_ENGINE_NVENC0; break;
+               case 0x0000000f: info->index = NVKM_ENGINE_NVENC1; break;
+               case 0x00000010: info->index = NVKM_ENGINE_NVDEC; break;
+                       break;
+               default:
+                       break;
+               }
+
+               nvkm_debug(subdev, "%02x (%8s): addr %06x fault %2d engine %2d "
+                                  "runlist %2d intr %2d reset %2d\n", type,
+                          info->index == NVKM_SUBDEV_NR ? NULL :
+                                         nvkm_subdev_name[info->index],
+                          info->addr, info->fault, info->engine, info->runlist,
+                          info->intr, info->reset);
+               info = NULL;
+       }
+
+       return 0;
+}
+
+static const struct nvkm_top_func
+gk104_top = {
+       .oneinit = gk104_top_oneinit,
+};
+
+int
+gk104_top_new(struct nvkm_device *device, int index, struct nvkm_top **ptop)
+{
+       return nvkm_top_new_(&gk104_top, device, index, ptop);
+}