diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2012-03-20 17:17:59 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-21 02:55:50 -0400 |
commit | cb28bb341c2e43dde599d888a99a4a83f50369cc (patch) | |
tree | b2235a8c0e00109ba9212d2a2eea4c8425a610a6 | |
parent | f73468810ec2492b1bc99da87956023935de4805 (diff) |
drm/radeon/kms: add SI 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.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_family.h | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index d2870a014ec0..2081972557f5 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -1638,6 +1638,7 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); | |||
1638 | #define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \ | 1638 | #define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \ |
1639 | (rdev->flags & RADEON_IS_IGP)) | 1639 | (rdev->flags & RADEON_IS_IGP)) |
1640 | #define ASIC_IS_DCE5(rdev) ((rdev->family >= CHIP_BARTS)) | 1640 | #define ASIC_IS_DCE5(rdev) ((rdev->family >= CHIP_BARTS)) |
1641 | #define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_TAHITI)) | ||
1641 | 1642 | ||
1642 | /* | 1643 | /* |
1643 | * BIOS helpers. | 1644 | * BIOS helpers. |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 49f7cb7e226b..9b8dace0c60c 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -89,6 +89,9 @@ static const char radeon_family_name[][16] = { | |||
89 | "TURKS", | 89 | "TURKS", |
90 | "CAICOS", | 90 | "CAICOS", |
91 | "CAYMAN", | 91 | "CAYMAN", |
92 | "TAHITI", | ||
93 | "PITCAIRN", | ||
94 | "VERDE", | ||
92 | "LAST", | 95 | "LAST", |
93 | }; | 96 | }; |
94 | 97 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h index ec2f1ea84f81..71d626a58815 100644 --- a/drivers/gpu/drm/radeon/radeon_family.h +++ b/drivers/gpu/drm/radeon/radeon_family.h | |||
@@ -87,6 +87,9 @@ enum radeon_family { | |||
87 | CHIP_TURKS, | 87 | CHIP_TURKS, |
88 | CHIP_CAICOS, | 88 | CHIP_CAICOS, |
89 | CHIP_CAYMAN, | 89 | CHIP_CAYMAN, |
90 | CHIP_TAHITI, | ||
91 | CHIP_PITCAIRN, | ||
92 | CHIP_VERDE, | ||
90 | CHIP_LAST, | 93 | CHIP_LAST, |
91 | }; | 94 | }; |
92 | 95 | ||