]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/nouveau: recognise GM200 chipset
authorBen Skeggs <bskeggs@redhat.com>
Wed, 10 Feb 2016 22:25:35 +0000 (08:25 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2016 00:13:06 +0000 (10:13 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

index 8ef0ae8540386093382fa40749057a46719d8e0b..47748e009d59430f7869f010925820b438efb224 100644 (file)
@@ -1962,6 +1962,36 @@ nv117_chipset = {
        .sw = gf100_sw_new,
 };
 
+static const struct nvkm_device_chip
+nv120_chipset = {
+       .name = "GM200",
+       .bar = gf100_bar_new,
+       .bios = nvkm_bios_new,
+       .bus = gf100_bus_new,
+       .devinit = gm204_devinit_new,
+       .fb = gm107_fb_new,
+       .fuse = gm107_fuse_new,
+       .gpio = gk104_gpio_new,
+       .i2c = gm204_i2c_new,
+       .ibus = gm204_ibus_new,
+       .imem = nv50_instmem_new,
+       .ltc = gm204_ltc_new,
+       .mc = gk20a_mc_new,
+       .mmu = gf100_mmu_new,
+       .mxm = nv50_mxm_new,
+       .pci = gk104_pci_new,
+       .pmu = gm107_pmu_new,
+       .timer = gk20a_timer_new,
+       .volt = gk104_volt_new,
+       .ce[0] = gm204_ce_new,
+       .ce[1] = gm204_ce_new,
+       .ce[2] = gm204_ce_new,
+       .disp = gm204_disp_new,
+       .dma = gf119_dma_new,
+       .fifo = gm204_fifo_new,
+       .sw = gf100_sw_new,
+};
+
 static const struct nvkm_device_chip
 nv124_chipset = {
        .name = "GM204",
@@ -2461,6 +2491,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
                case 0x106: device->chip = &nv106_chipset; break;
                case 0x108: device->chip = &nv108_chipset; break;
                case 0x117: device->chip = &nv117_chipset; break;
+               case 0x120: device->chip = &nv120_chipset; break;
                case 0x124: device->chip = &nv124_chipset; break;
                case 0x126: device->chip = &nv126_chipset; break;
                case 0x12b: device->chip = &nv12b_chipset; break;