Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 083dba02 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/device: recognise GM204 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c21e6b30

drivers/gpu/drm/nouveau/core/engine/device/base.c

+2 −1
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
			case 0x0e0:

			case 0x0f0:

			case 0x100: device->card_type = NV_E0; break;

			case 0x110: device->card_type = GM100; break;

			case 0x110:

			case 0x120: device->card_type = GM100; break;

			default:

				break;

			}

drivers/gpu/drm/nouveau/core/engine/device/gm100.c

+43 −0
Original line number Diff line number Diff line
@@ -96,6 +96,49 @@ gm100_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_BSP    ] = &nve0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

#endif

		break;

	case 0x124:

		device->cname = "GM204";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gm204_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

#if 0

		/* looks to be some non-trivial changes */

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		/* priv ring says no to 0x10eb14 writes */

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;

#endif

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gm204_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gm107_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gm107_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] =  nv108_pwr_oclass;

#if 0

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvd0_dmaeng_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gm107_graph_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DISP   ] =  gm204_disp_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_COPY0  ] = &gm204_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &gm204_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &gm204_copy2_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nve0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

#endif

		break;

	default: