aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-12-18 17:01:35 -0500
committerAlex Deucher <alexander.deucher@amd.com>2013-02-01 19:34:23 -0500
commit624d35242a90cb508064c11c1ff3beb54f08a6a5 (patch)
tree2976b8d190f981c6127cb7c8594de475ee9b6481 /drivers
parentdf16004447fe55dcd6f05f6bb47bf8eaeddb160c (diff)
drm/radeon: add Oland chip family
Oland is a new asic in the SI family. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon.h1
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c1
-rw-r--r--drivers/gpu/drm/radeon/radeon_family.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 307d681b3443..59bfbd3868c9 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1769,6 +1769,7 @@ void r100_pll_errata_after_index(struct radeon_device *rdev);
1769#define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_ARUBA)) 1769#define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_ARUBA))
1770#define ASIC_IS_DCE61(rdev) ((rdev->family >= CHIP_ARUBA) && \ 1770#define ASIC_IS_DCE61(rdev) ((rdev->family >= CHIP_ARUBA) && \
1771 (rdev->flags & RADEON_IS_IGP)) 1771 (rdev->flags & RADEON_IS_IGP))
1772#define ASIC_IS_DCE64(rdev) ((rdev->family == CHIP_OLAND))
1772 1773
1773/* 1774/*
1774 * BIOS helpers. 1775 * BIOS helpers.
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index edfc54e41842..6a36f4b67680 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -93,6 +93,7 @@ static const char radeon_family_name[][16] = {
93 "TAHITI", 93 "TAHITI",
94 "PITCAIRN", 94 "PITCAIRN",
95 "VERDE", 95 "VERDE",
96 "OLAND",
96 "LAST", 97 "LAST",
97}; 98};
98 99
diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h
index d1fafeabea09..2d91123f2759 100644
--- a/drivers/gpu/drm/radeon/radeon_family.h
+++ b/drivers/gpu/drm/radeon/radeon_family.h
@@ -91,6 +91,7 @@ enum radeon_family {
91 CHIP_TAHITI, 91 CHIP_TAHITI,
92 CHIP_PITCAIRN, 92 CHIP_PITCAIRN,
93 CHIP_VERDE, 93 CHIP_VERDE,
94 CHIP_OLAND,
94 CHIP_LAST, 95 CHIP_LAST,
95}; 96};
96 97