From 8a426b6a1e547860c06c0bdb047af4adfdd2fda0 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 30 Aug 2012 14:00:03 -0400
Subject: [PATCH] --- yaml --- r: 358143 b: refs/heads/master c:
 e737a14cd1f30a0bca753ae32ebada10adf93c3b h: refs/heads/master i:   358141:
 bcc220f9dcfb277996b9a9edce1b9137aec543b8   358139:
 59989dcc6cd3a9e8f77d9b1d5c5bd71842130002   358135:
 d35b87fdd1a9f0741de9a763453990e155c96e11   358127:
 bf80aacdaa3db5ec988046fe961c76b99cd163a1   358111:
 8a104c525863699766953ef96531527ff1583981   358079:
 61f88f7a1ded2b118e66a8700df6ebb3aadf0420   358015:
 9459af72807804accbe54bb162635c3dae7396cd   357887:
 39060d6c853344568e172c506ef3657dd28626e4 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_asic.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4e8c7d986c3f..597d4075f6b4 100644
--- 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
index 60edad7e4311..67f008febec7 100644
--- 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 */