drm/radeon/kms: add SI chip families

Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index d2870a014ec03df66b1107faf91be3a70ffee9a8..2081972557f578def9c5001597ce193842ad83f6 100644 (file)
--- 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);
 #define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM) && \
                             (rdev->flags & RADEON_IS_IGP))
 #define ASIC_IS_DCE5(rdev) ((rdev->family >= CHIP_BARTS))
+#define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_TAHITI))
 
 /*
  * BIOS helpers.

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 49f7cb7e226b893a4a95a068b25179a30f93c892..9b8dace0c60c2fb87d101126f6f30fc1805630d6 100644 (file)
--- 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] = {
        "TURKS",
        "CAICOS",
        "CAYMAN",
+       "TAHITI",
+       "PITCAIRN",
+       "VERDE",
        "LAST",
 };
 

diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h
index ec2f1ea84f81e6c292543aa1e1a56433a19a253f..71d626a588151bfc5cc51beaffc60b3b0190938b 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_family.h
+++ b/drivers/gpu/drm/radeon/radeon_family.h
@@ -87,6 +87,9 @@ enum radeon_family {
        CHIP_TURKS,
        CHIP_CAICOS,
        CHIP_CAYMAN,
+       CHIP_TAHITI,
+       CHIP_PITCAIRN,
+       CHIP_VERDE,
        CHIP_LAST,
 };