aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-04-20 20:35:38 -0400
committerBen Skeggs <bskeggs@redhat.com>2016-05-20 00:43:04 -0400
commitf9e2029443afc550365864abf760419371cc3bc1 (patch)
tree7bdb2b65c9fcd0d52d92fba05de98bbda149f83c
parent00f50c662c5aa3cebea62015d1df8cd5b19a41b6 (diff)
drm/nouveau/core: recognise GM108 chipsets
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/base.c35
1 files changed, 35 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 a364efe60a18..4572debcb0c9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -1989,6 +1989,40 @@ nv117_chipset = {
1989}; 1989};
1990 1990
1991static const struct nvkm_device_chip 1991static const struct nvkm_device_chip
1992nv118_chipset = {
1993 .name = "GM108",
1994 .bar = gf100_bar_new,
1995 .bios = nvkm_bios_new,
1996 .bus = gf100_bus_new,
1997 .clk = gk104_clk_new,
1998 .devinit = gm107_devinit_new,
1999 .fb = gm107_fb_new,
2000 .fuse = gm107_fuse_new,
2001 .gpio = gk104_gpio_new,
2002 .i2c = gf119_i2c_new,
2003 .ibus = gk104_ibus_new,
2004 .iccsense = gf100_iccsense_new,
2005 .imem = nv50_instmem_new,
2006 .ltc = gm107_ltc_new,
2007 .mc = gk20a_mc_new,
2008 .mmu = gf100_mmu_new,
2009 .mxm = nv50_mxm_new,
2010 .pci = gk104_pci_new,
2011 .pmu = gm107_pmu_new,
2012 .therm = gm107_therm_new,
2013 .timer = gk20a_timer_new,
2014 .top = gk104_top_new,
2015 .volt = gk104_volt_new,
2016 .ce[0] = gm107_ce_new,
2017 .ce[2] = gm107_ce_new,
2018 .disp = gm107_disp_new,
2019 .dma = gf119_dma_new,
2020 .fifo = gm107_fifo_new,
2021 .gr = gm107_gr_new,
2022 .sw = gf100_sw_new,
2023};
2024
2025static const struct nvkm_device_chip
1992nv120_chipset = { 2026nv120_chipset = {
1993 .name = "GM200", 2027 .name = "GM200",
1994 .bar = gf100_bar_new, 2028 .bar = gf100_bar_new,
@@ -2537,6 +2571,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
2537 case 0x106: device->chip = &nv106_chipset; break; 2571 case 0x106: device->chip = &nv106_chipset; break;
2538 case 0x108: device->chip = &nv108_chipset; break; 2572 case 0x108: device->chip = &nv108_chipset; break;
2539 case 0x117: device->chip = &nv117_chipset; break; 2573 case 0x117: device->chip = &nv117_chipset; break;
2574 case 0x118: device->chip = &nv118_chipset; break;
2540 case 0x120: device->chip = &nv120_chipset; break; 2575 case 0x120: device->chip = &nv120_chipset; break;
2541 case 0x124: device->chip = &nv124_chipset; break; 2576 case 0x124: device->chip = &nv124_chipset; break;
2542 case 0x126: device->chip = &nv126_chipset; break; 2577 case 0x126: device->chip = &nv126_chipset; break;