---

yaml --- r: 358143 b: refs/heads/master c: e737a14 h: refs/heads/master i: 358141: bcc220f 358139: 59989dc 358135: d35b87f 358127: bf80aac 358111: 8a104c5 358079: 61f88f7 358015: 9459af7 357887: 39060d6 v: v3
git-mirror · Feb 2, 2013 · 8a426b6 · 8a426b6
1 parent b0e5138
commit 8a426b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc7f5d24dddfbe75893e25d84ebf9d7579c34c1
+refs/heads/master: e737a14cd1f30a0bca753ae32ebada10adf93c3b
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_asic.c b/trunk/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1944,9 +1944,13 @@ int radeon_asic_init(struct radeon_device *rdev)
 	case CHIP_TAHITI:
 	case CHIP_PITCAIRN:
 	case CHIP_VERDE:
+	case CHIP_OLAND:
 		rdev->asic = &si_asic;
 		/* set num crtcs */
-		rdev->num_crtc = 6;
+		if (rdev->family == CHIP_OLAND)
+			rdev->num_crtc = 2;
+		else
+			rdev->num_crtc = 6;
 		break;
 	default:
 		/* FIXME: not supported yet */