Mesa (master): r300c/r300g: add 3155 rv380 pci id

[Dave Airlie]

Module: Mesa
Branch: master
Commit: f7c2d4fee3104008c21078879cbc5720d7bc1be6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7c2d4fee3104008c21078879cbc5720d7bc1be6

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 19 19:22:03 2010 +1000

r300c/r300g: add 3155 rv380 pci id

---

 src/gallium/drivers/r300/r300_chipset.c      |    1 +
 src/mesa/drivers/dri/radeon/radeon_chipset.h |    1 +
 src/mesa/drivers/dri/radeon/radeon_screen.c  |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 9b2163e..c77e944 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -108,6 +108,7 @@ void r300_parse_chipset(struct r300_capabilities* caps)
         case 0x3150:
         case 0x3152:
         case 0x3154:
+        case 0x3155:
         case 0x3E50:
         case 0x3E54:
             caps->family = CHIP_FAMILY_RV380;
diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h
index 98732c8..b7ee9a1 100644
--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
+++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
@@ -12,6 +12,7 @@
 #define PCI_CHIP_RV380_3150		0x3150
 #define PCI_CHIP_RV380_3152		0x3152
 #define PCI_CHIP_RV380_3154		0x3154
+#define PCI_CHIP_RV380_3155		0x3155
 #define PCI_CHIP_RV380_3E50		0x3E50
 #define PCI_CHIP_RV380_3E54		0x3E54
 #define PCI_CHIP_RS100_4136		0x4136
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 4d7255f..fca0f81 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -516,6 +516,7 @@ static int radeon_set_screen_flags(radeonScreenPtr screen, int device_id)
    case PCI_CHIP_RV380_3150:
    case PCI_CHIP_RV380_3152:
    case PCI_CHIP_RV380_3154:
+   case PCI_CHIP_RV380_3155:
    case PCI_CHIP_RV380_3E50:
    case PCI_CHIP_RV380_3E54:
       screen->chip_family = CHIP_FAMILY_RV380;