From 36c4d89b48ab31f2c8fefefbc3bc17cc78617e33 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 21 Aug 2012 13:47:23 -0400 Subject: update chip families for cayman, aruba, SI Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie --- radeon.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/radeon.h b/radeon.h index 7e99a1f..9c6ef9b 100644 --- a/radeon.h +++ b/radeon.h @@ -11,8 +11,10 @@ static char *family_strings[] = {"Unknown", "legacy", "radeon", "rv770", "rv730", "rv710", "rv740", "cedar", "redwood", "juniper", "cypress", "hemlock", - "palm", - "barts", "turks", "caicos" }; + "palm", "sumo", "sumo2", + "barts", "turks", "caicos", "cayman", + "aruba", + "tahiti", "pitcairn", "verde" }; typedef enum { CHIP_FAMILY_UNKNOW, @@ -62,10 +64,16 @@ typedef enum { CHIP_FAMILY_CYPRESS, CHIP_FAMILY_HEMLOCK, CHIP_FAMILY_PALM, + CHIP_FAMILY_SUMO, + CHIP_FAMILY_SUMO2, CHIP_FAMILY_BARTS, CHIP_FAMILY_TURKS, CHIP_FAMILY_CAICOS, CHIP_FAMILY_CAYMAN, + CHIP_FAMILY_ARUBA, + CHIP_FAMILY_TAHITI, + CHIP_FAMILY_PITCAIRN, + CHIP_FAMILY_VERDE, CHIP_FAMILY_LAST } RADEONChipFamily; @@ -95,7 +103,10 @@ typedef struct { (card_info->chip_family <= CHIP_FAMILY_RV740)) #define IS_DISPLAY_DCE4(card_info) (card_info && \ (card_info->chip_family >= CHIP_FAMILY_CEDAR) && \ - (card_info->chip_family <= CHIP_FAMILY_PALM)) + (card_info->chip_family <= CHIP_FAMILY_SUMO2)) #define IS_DISPLAY_DCE5(card_info) (card_info && \ (card_info->chip_family >= CHIP_FAMILY_BARTS) && \ - (card_info->chip_family <= CHIP_FAMILY_CAICOS)) + (card_info->chip_family <= CHIP_FAMILY_CAYMAN)) +#define IS_DISPLAY_DCE6(card_info) (card_info && \ + (card_info->chip_family >= CHIP_FAMILY_ARUBA) && \ + (card_info->chip_family <= CHIP_FAMILY_VERDE)) -- cgit v1.2.3