drm/nouveau/top/gv100: initial support

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 4a2d413..777ba68 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2400,6 +2400,7 @@ nv140_chipset = {
        .bios = nvkm_bios_new,
        .devinit = gv100_devinit_new,
        .pci = gp100_pci_new,
+       .top = gk104_top_new,
 };
 
 static int

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
index fea4957..4f1f3e8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
@@ -48,7 +48,8 @@ gk104_top_oneinit(struct nvkm_top *top)
                case 0x00000001: /* DATA */
                        inst        = (data & 0x3c000000) >> 26;
                        info->addr  = (data & 0x00fff000);
-                       info->fault = (data & 0x000000f8) >> 3;
+                       if (data & 0x00000004)
+                               info->fault = (data & 0x000003f8) >> 3;
                        break;
                case 0x00000002: /* ENUM */
                        if (data & 0x00000020)