drm/nouveau/core: recognise TU104

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h
index 4f5233107f5f83d4ea2abbf8a639278f6588e577..4cbed03293676742c5e5b2b72f50537df63a0e1e 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cl0080.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cl0080.h
@@ -32,6 +32,7 @@ struct nv_device_info_v0 {
 #define NV_DEVICE_INFO_V0_MAXWELL                                          0x09
 #define NV_DEVICE_INFO_V0_PASCAL                                           0x0a
 #define NV_DEVICE_INFO_V0_VOLTA                                            0x0b
+#define NV_DEVICE_INFO_V0_TURING                                           0x0c
        __u8  family;
        __u8  pad06[2];
        __u64 ram_size;

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index feb2215f1ca7f6f9ed239f4955bef60ec384c297..9457be12c522f5f2e03bf019c8b910b2b0c1dc23 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -117,6 +117,7 @@ struct nvkm_device {
                GM100    = 0x110,
                GP100    = 0x130,
                GV100    = 0x140,
+               TU100    = 0x160,
        } card_type;
        u32 chipset;
        u8  chiprev;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 90f4281362fcd3714f5ad4446aff6552e4427595..1ffd9e4a447b2f0e551ff6ea9ba28b5ee038b644 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2434,6 +2434,11 @@ nv140_chipset = {
        .sec2 = gp102_sec2_new,
 };
 
+static const struct nvkm_device_chip
+nv164_chipset = {
+       .name = "TU104",
+};
+
 static int
 nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 size,
                       struct nvkm_notify *notify)
@@ -2792,6 +2797,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
                        case 0x120: device->card_type = GM100; break;
                        case 0x130: device->card_type = GP100; break;
                        case 0x140: device->card_type = GV100; break;
+                       case 0x160: device->card_type = TU100; break;
                        default:
                                break;
                        }
@@ -2884,6 +2890,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
                case 0x138: device->chip = &nv138_chipset; break;
                case 0x13b: device->chip = &nv13b_chipset; break;
                case 0x140: device->chip = &nv140_chipset; break;
+               case 0x164: device->chip = &nv164_chipset; break;
                default:
                        nvdev_error(device, "unknown chipset (%08x)\n", boot0);
                        goto done;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
index 91072836e8163ec2ea75aa9a8afad35e4eef8cb8..092ddc4ffefac09c51b1ec705ff36f746434040d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
@@ -175,6 +175,7 @@ nvkm_udevice_info(struct nvkm_udevice *udev, void *data, u32 size)
        case GM100: args->v0.family = NV_DEVICE_INFO_V0_MAXWELL; break;
        case GP100: args->v0.family = NV_DEVICE_INFO_V0_PASCAL; break;
        case GV100: args->v0.family = NV_DEVICE_INFO_V0_VOLTA; break;
+       case TU100: args->v0.family = NV_DEVICE_INFO_V0_TURING; break;
        default:
                args->v0.family = 0;
                break;