Merge branch 'mesa_7_5_branch'

[mesa.git] / src / gallium / drivers / r300 / r300_chipset.c

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index f2dc8aedaad5982624c3814b9a51e3fe3297093d..00fae8d26f3df80d1efede5f938a2baf314be5a8 100644 (file)
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -21,6 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "r300_chipset.h"
+#include "util/u_debug.h"
 
 /* r300_chipset: A file all to itself for deducing the various properties of
  * Radeons. */
@@ -29,10 +30,9 @@
 void r300_parse_chipset(struct r300_capabilities* caps)
 {
     /* Reasonable defaults */
-    caps->has_tcl = TRUE;
+    caps->has_tcl = getenv("RADEON_NO_TCL") ? FALSE : TRUE;
     caps->is_r500 = FALSE;
-    caps->num_vert_pipes = 4;
-
+    caps->num_vert_fpus = 4;
 
     /* Note: These are not ordered by PCI ID. I leave that task to GCC,
      * which will perform the ordering while collating jump tables. Instead,
@@ -112,7 +112,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x4A50:
         case 0x4A54:
             caps->family = CHIP_FAMILY_R420;
-            caps->num_vert_pipes = 6;
+            caps->num_vert_fpus = 6;
             break;
 
         case 0x5548:
@@ -125,7 +125,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x5554:
         case 0x5D57:
             caps->family = CHIP_FAMILY_R423;
-            caps->num_vert_pipes = 6;
+            caps->num_vert_fpus = 6;
             break;
 
         case 0x554C:
@@ -136,7 +136,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x5D49:
         case 0x5D4A:
             caps->family = CHIP_FAMILY_R430;
-            caps->num_vert_pipes = 6;
+            caps->num_vert_fpus = 6;
             break;
 
         case 0x5D4C:
@@ -146,15 +146,16 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x5D50:
         case 0x5D52:
             caps->family = CHIP_FAMILY_R480;
-            caps->num_vert_pipes = 6;
+            caps->num_vert_fpus = 6;
             break;
 
+        case 0x4B48:
         case 0x4B49:
         case 0x4B4A:
         case 0x4B4B:
         case 0x4B4C:
             caps->family = CHIP_FAMILY_R481;
-            caps->num_vert_pipes = 6;
+            caps->num_vert_fpus = 6;
             break;
 
         case 0x5E4C:
@@ -170,7 +171,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x5E4B:
         case 0x5E4D:
             caps->family = CHIP_FAMILY_RV410;
-            caps->num_vert_pipes = 6;
+            caps->num_vert_fpus = 6;
             break;
 
         case 0x5954:
@@ -203,6 +204,13 @@ void r300_parse_chipset(struct r300_capabilities* caps)
             caps->has_tcl = FALSE;
             break;
 
+        case 0x793F:
+        case 0x7941:
+        case 0x7942:
+            caps->family = CHIP_FAMILY_RS600;
+            caps->has_tcl = FALSE;
+            break;
+
         case 0x796C:
         case 0x796D:
         case 0x796E:
@@ -226,7 +234,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x710E:
         case 0x710F:
             caps->family = CHIP_FAMILY_R520;
-            caps->num_vert_pipes = 8;
+            caps->num_vert_fpus = 8;
             caps->is_r500 = TRUE;
             break;
 
@@ -269,7 +277,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x7210:
         case 0x7211:
             caps->family = CHIP_FAMILY_RV515;
-            caps->num_vert_pipes = 2;
+            caps->num_vert_fpus = 2;
             caps->is_r500 = TRUE;
             break;
 
@@ -290,7 +298,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x71DA:
         case 0x71DE:
             caps->family = CHIP_FAMILY_RV530;
-            caps->num_vert_pipes = 5;
+            caps->num_vert_fpus = 5;
             caps->is_r500 = TRUE;
             break;
 
@@ -310,13 +318,13 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x724F:
         case 0x7284:
             caps->family = CHIP_FAMILY_R580;
-            caps->num_vert_pipes = 8;
+            caps->num_vert_fpus = 8;
             caps->is_r500 = TRUE;
             break;
 
         case 0x7280:
             caps->family = CHIP_FAMILY_RV570;
-            caps->num_vert_pipes = 5;
+            caps->num_vert_fpus = 5;
             caps->is_r500 = TRUE;
             break;
 
@@ -332,12 +340,13 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x7293:
         case 0x7297:
             caps->family = CHIP_FAMILY_RV560;
-            caps->num_vert_pipes = 5;
+            caps->num_vert_fpus = 5;
             caps->is_r500 = TRUE;
             break;
 
         default:
-            /* XXX not an r300?! */
+            debug_printf("r300: Warning: Unknown chipset 0x%x\n",
+                caps->pci_id);
             break;
     }
 }