aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-07-09 10:41:01 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-07-14 11:53:25 +1000
commitcfb083f692b884c7cc5376ffe04ce7cd9d8331bc (patch)
tree524e084a0e06e8ffafc1ed88075c8f95e913b79a /drivers/gpu/drm/nouveau
parentdrm/nouveau/sw/gp100: initial support (diff)
downloadlinux-dev-cfb083f692b884c7cc5376ffe04ce7cd9d8331bc.tar.xz
linux-dev-cfb083f692b884c7cc5376ffe04ce7cd9d8331bc.zip
drm/nouveau/core: recognise GP104 chipset
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/base.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 3c4f4bcea81b..d1a2ff01505c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2181,6 +2181,11 @@ nv130_chipset = {
.sw = gf100_sw_new,
};
+static const struct nvkm_device_chip
+nv134_chipset = {
+ .name = "GP104",
+};
+
static int
nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 size,
struct nvkm_notify *notify)
@@ -2615,6 +2620,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
case 0x126: device->chip = &nv126_chipset; break;
case 0x12b: device->chip = &nv12b_chipset; break;
case 0x130: device->chip = &nv130_chipset; break;
+ case 0x134: device->chip = &nv134_chipset; break;
default:
nvdev_error(device, "unknown chipset (%08x)\n", boot0);
goto done;