---

yaml --- r: 345440 b: refs/heads/master c: 63718a0 h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · 32bc953 · 32bc953
1 parent 69dfccc
commit 32bc953
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47057302f075578618ea36fc3c4c97a5a6f97f00
+refs/heads/master: 63718a0730c666edcac94c261d1df5edef80fd23
diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -1896,6 +1896,11 @@ nvd0_display_create(struct drm_device *dev)
 	static const u16 oclass[] = {
 		NVE0_DISP_CLASS,
 		NVD0_DISP_CLASS,
+		NVA3_DISP_CLASS,
+		NV94_DISP_CLASS,
+		NVA0_DISP_CLASS,
+		NV84_DISP_CLASS,
+		NV50_DISP_CLASS,
 	};
 	struct nouveau_device *device = nouveau_dev(dev);
 	struct nouveau_drm *drm = nouveau_drm(dev);
@@ -1949,7 +1954,11 @@ nvd0_display_create(struct drm_device *dev)
 		goto out;
 
 	/* create crtc objects to represent the hw heads */
-	crtcs = nv_rd32(device, 0x022448);
+	if (nv_mclass(disp->core) >= NVD0_DISP_CLASS)
+		crtcs = nv_rd32(device, 0x022448);
+	else
+		crtcs = 2;
+
 	for (i = 0; i < crtcs; i++) {
 		ret = nvd0_crtc_create(dev, disp->core, i);
 		if (ret)