r300: Add num_vert_pipes (and remove busted num_pipes.)

1 files changed, 14 insertions, 25 deletions

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 1dc9b8cf3c..b7de2359cb 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -32,6 +32,8 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
     caps->pci_id = pci_id;
     caps->has_tcl = TRUE;
     caps->is_r500 = FALSE;
+    caps->num_vert_pipes = 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,
@@ -39,7 +41,6 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
     switch (pci_id) {
         case 0x4144:
             caps->family = CHIP_FAMILY_R300;
-            caps->num_pipes = 1;
             break;
 
         case 0x4145:
@@ -50,7 +51,6 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x4E46:
         case 0x4E47:
             caps->family = CHIP_FAMILY_R300;
-            caps->num_pipes = 2;
             break;
 
         case 0x4150:
@@ -67,7 +67,6 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x4E54:
         case 0x4E56:
             caps->family = CHIP_FAMILY_RV350;
-            caps->num_pipes = 1;
             break;
 
         case 0x4148:
@@ -78,12 +77,10 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x4E49:
         case 0x4E4B:
             caps->family = CHIP_FAMILY_R350;
-            caps->num_pipes = 2;
             break;
 
         case 0x4E4A:
             caps->family = CHIP_FAMILY_R360;
-            caps->num_pipes = 2;
             break;
 
         case 0x5460:
@@ -95,7 +92,6 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x5B64:
         case 0x5B65:
             caps->family = CHIP_FAMILY_RV370;
-            caps->num_pipes = 1;
             break;
 
         case 0x3150:
@@ -104,7 +100,6 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x3E50:
         case 0x3E54:
             caps->family = CHIP_FAMILY_RV380;
-            caps->num_pipes = 1;
             break;
 
         case 0x4A48:
@@ -118,7 +113,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x4A50:
         case 0x4A54:
             caps->family = CHIP_FAMILY_R420;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 6;
             break;
 
         case 0x5548:
@@ -131,7 +126,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x5554:
         case 0x5D57:
             caps->family = CHIP_FAMILY_R423;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 6;
             break;
 
         case 0x554C:
@@ -142,7 +137,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x5D49:
         case 0x5D4A:
             caps->family = CHIP_FAMILY_R430;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 6;
             break;
 
         case 0x5D4C:
@@ -152,7 +147,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x5D50:
         case 0x5D52:
             caps->family = CHIP_FAMILY_R480;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 6;
             break;
 
         case 0x4B49:
@@ -160,7 +155,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x4B4B:
         case 0x4B4C:
             caps->family = CHIP_FAMILY_R481;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 6;
             break;
 
         case 0x5E4C:
@@ -176,41 +171,36 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x5E4B:
         case 0x5E4D:
             caps->family = CHIP_FAMILY_RV410;
-            caps->num_pipes = 1;
+            caps->num_vert_pipes = 6;
             break;
 
         case 0x5954:
         case 0x5955:
             caps->family = CHIP_FAMILY_RS480;
-            caps->num_pipes = 1; /* CHECK ME */
             caps->has_tcl = FALSE;
             break;
 
         case 0x5974:
         case 0x5975:
             caps->family = CHIP_FAMILY_RS482;
-            caps->num_pipes = 1; /* CHECK ME */
             caps->has_tcl = FALSE;
             break;
 
         case 0x5A41:
         case 0x5A42:
             caps->family = CHIP_FAMILY_RS400;
-            caps->num_pipes = 1; /* CHECK ME */
             caps->has_tcl = FALSE;
             break;
 
         case 0x5A61:
         case 0x5A62:
             caps->family = CHIP_FAMILY_RC410;
-            caps->num_pipes = 1; /* CHECK ME */
             caps->has_tcl = FALSE;
             break;
 
         case 0x791E:
         case 0x791F:
             caps->family = CHIP_FAMILY_RS690;
-            caps->num_pipes = 1; /* CHECK ME */
             caps->has_tcl = FALSE;
             break;
 
@@ -219,7 +209,6 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x796E:
         case 0x796F:
             caps->family = CHIP_FAMILY_RS740;
-            caps->num_pipes = 1; /* CHECK ME */
             caps->has_tcl = FALSE;
             break;
 
@@ -238,7 +227,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x710E:
         case 0x710F:
             caps->family = CHIP_FAMILY_R520;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 8;
             caps->is_r500 = TRUE;
             break;
 
@@ -281,7 +270,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x7210:
         case 0x7211:
             caps->family = CHIP_FAMILY_RV515;
-            caps->num_pipes = 1;
+            caps->num_vert_pipes = 2;
             caps->is_r500 = TRUE;
             break;
 
@@ -302,7 +291,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x71DA:
         case 0x71DE:
             caps->family = CHIP_FAMILY_RV530;
-            caps->num_pipes = 1;
+            caps->num_vert_pipes = 5;
             caps->is_r500 = TRUE;
             break;
 
@@ -322,13 +311,13 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x724F:
         case 0x7284:
             caps->family = CHIP_FAMILY_R580;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 8;
             caps->is_r500 = TRUE;
             break;
 
         case 0x7280:
             caps->family = CHIP_FAMILY_RV570;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 5;
             caps->is_r500 = TRUE;
             break;
 
@@ -344,7 +333,7 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         case 0x7293:
         case 0x7297:
             caps->family = CHIP_FAMILY_RV560;
-            caps->num_pipes = 4;
+            caps->num_vert_pipes = 5;
             caps->is_r500 = TRUE;
             break;