From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 30 Aug 2012 18:00:03 +0000 (-0400)
Subject: drm/radeon: radeon-asic updates for Oland
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e737a14cd1f30a0bca753ae32ebada10adf93c3b;p=deliverable%2Flinux.git

drm/radeon: radeon-asic updates for Oland

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 60edad7e4311..67f008febec7 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/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 */