aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-03-20 17:18:28 -0400
committerDave Airlie <airlied@redhat.com>2012-03-21 02:55:55 -0400
commit8848f759c0de139bada271aa446f48637c98ca1a (patch)
tree10a3f76c3e8bd2b104a0a5d4305f148237b60fcc /drivers/gpu/drm
parentfc7dbcc371c2b35d41f4db71aed7c55bb2a1175e (diff)
drm/radeon/kms: add trinity (TN) chip family
Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/radeon/radeon.h4
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c1
-rw-r--r--drivers/gpu/drm/radeon/radeon_family.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 8275b4184adb..138b95216d8d 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1688,7 +1688,9 @@ void r100_pll_errata_after_index(struct radeon_device *rdev);
1688#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \ 1688#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \
1689 (rdev->flags & RADEON_IS_IGP)) 1689 (rdev->flags & RADEON_IS_IGP))
1690#define ASIC_IS_DCE5(rdev) ((rdev->family >= CHIP_BARTS)) 1690#define ASIC_IS_DCE5(rdev) ((rdev->family >= CHIP_BARTS))
1691#define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_TAHITI)) 1691#define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_ARUBA))
1692#define ASIC_IS_DCE61(rdev) ((rdev->family >= CHIP_ARUBA) && \
1693 (rdev->flags & RADEON_IS_IGP))
1692 1694
1693/* 1695/*
1694 * BIOS helpers. 1696 * BIOS helpers.
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index beeefb841c0b..ea7df16e2f84 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -89,6 +89,7 @@ static const char radeon_family_name[][16] = {
89 "TURKS", 89 "TURKS",
90 "CAICOS", 90 "CAICOS",
91 "CAYMAN", 91 "CAYMAN",
92 "ARUBA",
92 "TAHITI", 93 "TAHITI",
93 "PITCAIRN", 94 "PITCAIRN",
94 "VERDE", 95 "VERDE",
diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h
index 71d626a58815..d1fafeabea09 100644
--- a/drivers/gpu/drm/radeon/radeon_family.h
+++ b/drivers/gpu/drm/radeon/radeon_family.h
@@ -87,6 +87,7 @@ enum radeon_family {
87 CHIP_TURKS, 87 CHIP_TURKS,
88 CHIP_CAICOS, 88 CHIP_CAICOS,
89 CHIP_CAYMAN, 89 CHIP_CAYMAN,
90 CHIP_ARUBA,
90 CHIP_TAHITI, 91 CHIP_TAHITI,
91 CHIP_PITCAIRN, 92 CHIP_PITCAIRN,
92 CHIP_VERDE, 93 CHIP_VERDE,