aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-01-06 21:19:12 -0500
committerDave Airlie <airlied@redhat.com>2011-01-06 23:11:18 -0500
commit1fe183050f71ba183fe2d693bbef5fa605723043 (patch)
treeef82ea7f64ebb496f5861c6e6a5ff54bfde65907
parent633b91643f50779897bcab5e50d08a4fe4ba9f13 (diff)
drm/radeon/kms: add NI chip families
Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon.h1
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c3
-rw-r--r--drivers/gpu/drm/radeon/radeon_family.h3
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 396e30703e7a..73730fd1d0af 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1337,6 +1337,7 @@ void r100_pll_errata_after_index(struct radeon_device *rdev);
1337#define ASIC_IS_DCE4(rdev) ((rdev->family >= CHIP_CEDAR)) 1337#define ASIC_IS_DCE4(rdev) ((rdev->family >= CHIP_CEDAR))
1338#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \ 1338#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \
1339 (rdev->flags & RADEON_IS_IGP)) 1339 (rdev->flags & RADEON_IS_IGP))
1340#define ASIC_IS_DCE5(rdev) ((rdev->family >= CHIP_BARTS))
1340 1341
1341/* 1342/*
1342 * BIOS helpers. 1343 * BIOS helpers.
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 44cf0d707006..e35343007229 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -82,6 +82,9 @@ static const char radeon_family_name[][16] = {
82 "CYPRESS", 82 "CYPRESS",
83 "HEMLOCK", 83 "HEMLOCK",
84 "PALM", 84 "PALM",
85 "BARTS",
86 "TURKS",
87 "CAICOS",
85 "LAST", 88 "LAST",
86}; 89};
87 90
diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h
index 4c222d5437d1..1ca55eb09ad3 100644
--- a/drivers/gpu/drm/radeon/radeon_family.h
+++ b/drivers/gpu/drm/radeon/radeon_family.h
@@ -81,6 +81,9 @@ enum radeon_family {
81 CHIP_CYPRESS, 81 CHIP_CYPRESS,
82 CHIP_HEMLOCK, 82 CHIP_HEMLOCK,
83 CHIP_PALM, 83 CHIP_PALM,
84 CHIP_BARTS,
85 CHIP_TURKS,
86 CHIP_CAICOS,
84 CHIP_LAST, 87 CHIP_LAST,
85}; 88};
86 89