drm/nouveau: fix unknown chipset for GTX 1060
Subsystems (3)
PATCH 1/1 drm/nouveau: fix unknown chipset for GTX 1060
Nouveau driver shows unknown chipset (136000a1) for GTX 1060, so it only gives VGA resolution on screen. Use the same chipset as nv134 then it shows FullHD. This commit copies fields from nv134_chipset to nv136_chipset for GTX 1060.
--- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +29 -0
@@ -2209,6 +2209,34 @@ nv134_chipset = { .fifo = gp100_fifo_new, }; +static const struct nvkm_device_chip +nv136_chipset = { + .name ="GP104" , + .bar = gf100_bar_new, + .bios = nvkm_bios_new, + .bus = gf100_bus_new, + .devinit = gm200_devinit_new, + .fb = gp104_fb_new, + .fuse = gm107_fuse_new, + .gpio = gk104_gpio_new, + .i2c = gm200_i2c_new, + .ibus = gm200_ibus_new, + .imem = nv50_instmem_new, + .ltc = gp100_ltc_new, + .mc = gp100_mc_new, + .mmu = gf100_mmu_new, + .pci = gp100_pci_new, + .timer = gk20a_timer_new, + .top = gk104_top_new, + .ce[0 ] = gp104_ce_new, + .ce[1 ] = gp104_ce_new, + .ce[2 ] = gp104_ce_new, + .ce[3 ] = gp104_ce_new, + .disp = gp104_disp_new, + .dma = gf119_dma_new, + .fifo = gp100_fifo_new, +}; +static int nvkm_device_event_ctor (struct nvkm_object *object,void *data,u32 size,struct nvkm_notify *notify)
@@ -2644,6 +2672,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,case 0x12b : device->chip = &nv12b_chipset;break ;case 0x130 : device->chip = &nv130_chipset;break ;case 0x134 : device->chip = &nv134_chipset;break ; +case 0x136 : device->chip = &nv136_chipset;break ;default :nvdev_error (device,"unknown chipset (%08x)\n" , boot0); goto done;
Signature · 1 line
2.1.4
Quoted 4 lines · Chris Chiu
Nouveau driver shows unknown chipset (
136000a1) for GTX 1060, so it only gives VGA resolution on screen. Use the same chipset as nv134 then it shows FullHD. This commit copies fields fromnv134_chipsettonv136_chipsetfor GTX 1060.
I have one of these sitting on my desk, but won't be merging support for it until it's been confirmed that no additional changes are required vs GP104. We've been bitten by just making these kind of blind assumptions before.
Thanks,
Ben.
Quoted 47 lines
Signed-off-by Chris Chiu <chiu-6IF/jdPJHihWk0Htik3J/[email protected]>--- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+)drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +28
-0@@ -2209,6 +2209,34 @@ nv134_chipset = { .fifo = gp100_fifo_new, }; +static const struct nvkm_device_chip +nv136_chipset = { + .name ="GP104" , + .bar = gf100_bar_new, + .bios = nvkm_bios_new, + .bus = gf100_bus_new, + .devinit = gm200_devinit_new, + .fb = gp104_fb_new, + .fuse = gm107_fuse_new, + .gpio = gk104_gpio_new, + .i2c = gm200_i2c_new, + .ibus = gm200_ibus_new, + .imem = nv50_instmem_new, + .ltc = gp100_ltc_new, + .mc = gp100_mc_new, + .mmu = gf100_mmu_new, + .pci = gp100_pci_new, + .timer = gk20a_timer_new, + .top = gk104_top_new, + .ce[0 ] = gp104_ce_new, + .ce[1 ] = gp104_ce_new, + .ce[2 ] = gp104_ce_new, + .ce[3 ] = gp104_ce_new, + .disp = gp104_disp_new, + .dma = gf119_dma_new, + .fifo = gp100_fifo_new, +}; +static int nvkm_device_event_ctor (struct nvkm_object *object,void *data,u32 size,struct nvkm_notify *notify)
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c nvkm_device_ctor(const struct nvkm_device_func *func, · line 2678
Quoted 7 lines
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +1
-0@@ -2644,6 +2672,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,case 0x12b : device->chip = &nv12b_chipset;break ;case 0x130 : device->chip = &nv130_chipset;break ;case 0x134 : device->chip = &nv134_chipset;break ; +case 0x136 : device->chip = &nv136_chipset;break ;default :nvdev_error (device,"unknown chipset (%08x)\n" , boot0); goto done;
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
we already have that included in 4.10
2016-12-12 12:26 GMT+01:00 Chris Chiu <[email protected]>:
Quoted 64 lines
Nouveau driver shows unknown chipset (
136000a1) for GTX 1060, so it only gives VGA resolution on screen. Use the same chipset as nv134 then it shows FullHD. This commit copies fields fromnv134_chipsettonv136_chipsetfor GTX 1060.Signed-off-by Chris Chiu <[email protected]>--- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+)drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +29
-1@@ -2209,6 +2209,34 @@ nv134_chipset = { .fifo = gp100_fifo_new, }; +static const struct nvkm_device_chip +nv136_chipset = { + .name ="GP104" , + .bar = gf100_bar_new, + .bios = nvkm_bios_new, + .bus = gf100_bus_new, + .devinit = gm200_devinit_new, + .fb = gp104_fb_new, + .fuse = gm107_fuse_new, + .gpio = gk104_gpio_new, + .i2c = gm200_i2c_new, + .ibus = gm200_ibus_new, + .imem = nv50_instmem_new, + .ltc = gp100_ltc_new, + .mc = gp100_mc_new, + .mmu = gf100_mmu_new, + .pci = gp100_pci_new, + .timer = gk20a_timer_new, + .top = gk104_top_new, + .ce[0 ] = gp104_ce_new, + .ce[1 ] = gp104_ce_new, + .ce[2 ] = gp104_ce_new, + .ce[3 ] = gp104_ce_new, + .disp = gp104_disp_new, + .dma = gf119_dma_new, + .fifo = gp100_fifo_new, +}; +static int nvkm_device_event_ctor (struct nvkm_object *object,void *data,u32 size,struct nvkm_notify *notify)@@ -2644,6 +2672,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,case 0x12b : device->chip = &nv12b_chipset;break ;case 0x130 : device->chip = &nv130_chipset;break ;case 0x134 : device->chip = &nv134_chipset;break ; +case 0x136 : device->chip = &nv136_chipset;break ;default :nvdev_error (device,"unknown chipset (%08x)\n" , boot0); goto done; --2.1.4
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau