summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-07-26 19:04:20 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-05-20 12:09:36 -0400
commit86a45cac3f86eb65bfdaa122acf1b9073f9e69b2 (patch)
tree05e16105727c8f56a511e0c5e6767f73bdd8d0af /drivers
parentc04c00b4c74aab251ce4fd4757c955cc31ecc50d (diff)
downloadlinux-3.10-86a45cac3f86eb65bfdaa122acf1b9073f9e69b2.tar.gz
linux-3.10-86a45cac3f86eb65bfdaa122acf1b9073f9e69b2.tar.bz2
linux-3.10-86a45cac3f86eb65bfdaa122acf1b9073f9e69b2.zip
drm/radeon: radeon-asic updates for Hainan
Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 6417132c50c..44a7a410141 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -2051,9 +2051,12 @@ int radeon_asic_init(struct radeon_device *rdev)
case CHIP_PITCAIRN:
case CHIP_VERDE:
case CHIP_OLAND:
+ case CHIP_HAINAN:
rdev->asic = &si_asic;
/* set num crtcs */
- if (rdev->family == CHIP_OLAND)
+ if (rdev->family == CHIP_HAINAN)
+ rdev->num_crtc = 0;
+ else if (rdev->family == CHIP_OLAND)
rdev->num_crtc = 2;
else
rdev->num_crtc = 6;