Commit 7b4f638b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nve0: recognise nvf0 as a kepler board (GK110) 



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

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

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
			case 0xa0: device->card_type = NV_50; break;

			case 0xc0: device->card_type = NV_C0; break;

			case 0xd0: device->card_type = NV_D0; break;

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

			case 0xe0:

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

			default:

				break;

			}

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

+34 −0
Original line number Diff line number Diff line
@@ -141,6 +141,40 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

		break;

	case 0xf0:

		device->cname = "GK110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] = &nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] = &nvc0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] = &nvc0_ltcg_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_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] = &nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nve0_graph_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DISP   ] = &nvf0_disp_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nve0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nve0_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_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:

		nv_fatal(device, "unknown Kepler chipset\n");

		return -EINVAL;