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>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 8275b4184adb2463bd169b88da4aae325053de2f..138b95216d8d0c469a9924e6d272b31b97fda34e 100644 (file)
--- 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);
 #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))
+#define ASIC_IS_DCE6(rdev) ((rdev->family >= CHIP_ARUBA))
+#define ASIC_IS_DCE61(rdev) ((rdev->family >= CHIP_ARUBA) && \
+                            (rdev->flags & RADEON_IS_IGP))
 
 /*
  * BIOS helpers.

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index beeefb841c0b76c7579e5803027b1edc9b5614fe..ea7df16e2f84f267f0a129fac762333b96d54b56 100644 (file)
--- 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] = {
        "TURKS",
        "CAICOS",
        "CAYMAN",
+       "ARUBA",
        "TAHITI",
        "PITCAIRN",
        "VERDE",

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