xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/pcidb/ati_pciids.csv  |   48 +++++++++++++++++++++++-----------------------
 src/radeon_chipinfo_gen.h |   48 +++++++++++++++++++++++-----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit bdbf766d8170f6ea6c16b9780ef5a4007730588b
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Fri Mar 8 14:00:09 2013 -0500

    radeon: mark trinity APUs with IGP flag
    
    Was missing on trinity.
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 27bcdeb..0166772 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -594,30 +594,30 @@
 "0x6778","CAICOS_6778","CAICOS",,,,,,"CAICOS"
 "0x6779","CAICOS_6779","CAICOS",,,,,,"CAICOS"
 "0x677B","CAICOS_677B","CAICOS",,,,,,"CAICOS"
-"0x9900","ARUBA_9900","ARUBA",1,,,,,"ARUBA"
-"0x9901","ARUBA_9901","ARUBA",,,,,,"ARUBA"
-"0x9903","ARUBA_9903","ARUBA",1,,,,,"ARUBA"
-"0x9904","ARUBA_9904","ARUBA",,,,,,"ARUBA"
-"0x9905","ARUBA_9905","ARUBA",,,,,,"ARUBA"
-"0x9906","ARUBA_9906","ARUBA",,,,,,"ARUBA"
-"0x9907","ARUBA_9907","ARUBA",1,,,,,"ARUBA"
-"0x9908","ARUBA_9908","ARUBA",1,,,,,"ARUBA"
-"0x9909","ARUBA_9909","ARUBA",1,,,,,"ARUBA"
-"0x990A","ARUBA_990A","ARUBA",1,,,,,"ARUBA"
-"0x990F","ARUBA_990F","ARUBA",,,,,,"ARUBA"
-"0x9910","ARUBA_9910","ARUBA",1,,,,,"ARUBA"
-"0x9913","ARUBA_9913","ARUBA",1,,,,,"ARUBA"
-"0x9917","ARUBA_9917","ARUBA",,,,,,"ARUBA"
-"0x9918","ARUBA_9918","ARUBA",,,,,,"ARUBA"
-"0x9919","ARUBA_9919","ARUBA",,,,,,"ARUBA"
-"0x9990","ARUBA_9990","ARUBA",1,,,,,"ARUBA"
-"0x9991","ARUBA_9991","ARUBA",,,,,,"ARUBA"
-"0x9992","ARUBA_9992","ARUBA",1,,,,,"ARUBA"
-"0x9993","ARUBA_9993","ARUBA",,,,,,"ARUBA"
-"0x9994","ARUBA_9994","ARUBA",1,,,,,"ARUBA"
-"0x99A0","ARUBA_99A0","ARUBA",1,,,,,"ARUBA"
-"0x99A2","ARUBA_99A2","ARUBA",1,,,,,"ARUBA"
-"0x99A4","ARUBA_99A4","ARUBA",,,,,,"ARUBA"
+"0x9900","ARUBA_9900","ARUBA",1,1,,,,"ARUBA"
+"0x9901","ARUBA_9901","ARUBA",,1,,,,"ARUBA"
+"0x9903","ARUBA_9903","ARUBA",1,1,,,,"ARUBA"
+"0x9904","ARUBA_9904","ARUBA",,1,,,,"ARUBA"
+"0x9905","ARUBA_9905","ARUBA",,1,,,,"ARUBA"
+"0x9906","ARUBA_9906","ARUBA",,1,,,,"ARUBA"
+"0x9907","ARUBA_9907","ARUBA",1,1,,,,"ARUBA"
+"0x9908","ARUBA_9908","ARUBA",1,1,,,,"ARUBA"
+"0x9909","ARUBA_9909","ARUBA",1,1,,,,"ARUBA"
+"0x990A","ARUBA_990A","ARUBA",1,1,,,,"ARUBA"
+"0x990F","ARUBA_990F","ARUBA",,1,,,,"ARUBA"
+"0x9910","ARUBA_9910","ARUBA",1,1,,,,"ARUBA"
+"0x9913","ARUBA_9913","ARUBA",1,1,,,,"ARUBA"
+"0x9917","ARUBA_9917","ARUBA",,1,,,,"ARUBA"
+"0x9918","ARUBA_9918","ARUBA",,1,,,,"ARUBA"
+"0x9919","ARUBA_9919","ARUBA",,1,,,,"ARUBA"
+"0x9990","ARUBA_9990","ARUBA",1,1,,,,"ARUBA"
+"0x9991","ARUBA_9991","ARUBA",,1,,,,"ARUBA"
+"0x9992","ARUBA_9992","ARUBA",1,1,,,,"ARUBA"
+"0x9993","ARUBA_9993","ARUBA",,1,,,,"ARUBA"
+"0x9994","ARUBA_9994","ARUBA",1,1,,,,"ARUBA"
+"0x99A0","ARUBA_99A0","ARUBA",1,1,,,,"ARUBA"
+"0x99A2","ARUBA_99A2","ARUBA",1,1,,,,"ARUBA"
+"0x99A4","ARUBA_99A4","ARUBA",,1,,,,"ARUBA"
 "0x6780","TAHITI_6780","TAHITI",,,,,,"TAHITI"
 "0x6784","TAHITI_6784","TAHITI",,,,,,"TAHITI"
 "0x6788","TAHITI_6788","TAHITI",,,,,,"TAHITI"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 3e2896a..6ef2c6f 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -513,30 +513,30 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x6778, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
  { 0x6779, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
  { 0x677B, CHIP_FAMILY_CAICOS, 0, 0, 0, 0, 0 },
- { 0x9900, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9901, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9903, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9904, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9905, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9906, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9907, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9908, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9909, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x990A, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x990F, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9910, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9913, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9917, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9918, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9919, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9990, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9991, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9992, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x9993, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
- { 0x9994, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x99A0, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x99A2, CHIP_FAMILY_ARUBA, 1, 0, 0, 0, 0 },
- { 0x99A4, CHIP_FAMILY_ARUBA, 0, 0, 0, 0, 0 },
+ { 0x9900, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9901, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9903, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9904, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9905, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9906, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9907, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9908, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9909, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x990A, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x990F, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9910, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9913, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9917, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9918, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9919, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9990, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9991, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9992, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x9993, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x9994, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x99A0, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x99A2, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x99A4, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
  { 0x6780, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x6784, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },
  { 0x6788, CHIP_FAMILY_TAHITI, 0, 0, 0, 0, 0 },