[Openchrome-devel] xf86-video-openchrome: 2 commits - src/via_id.c

[Xavier Bachelot]

 src/via_id.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 379a119cc4d1bb31060a8a1656b208324d60df00
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Jan 21 20:37:32 2013 +0100

    Fujitsu Futro A300 (reported by Alberto Asuero)

diff --git a/src/via_id.c b/src/via_id.c
index bba5792..bb18e84 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -254,6 +254,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
     {"HP T5550 Thin Client",                  VIA_VX900,   0x1106, 0x7122, VIA_DEVICE_CRT},
     {"Biostar Viotech 3200+",                 VIA_VX900,   0x1565, 0x120A, VIA_DEVICE_CRT},
     {"ASRock PV530",                          VIA_VX900,   0x1849, 0x7122, VIA_DEVICE_CRT},
+    {"Fujitsu Futro A300",                    VIA_VX900,   0xA0A0, 0x080F, VIA_DEVICE_CRT},
 
     /* keep this */
     {NULL,                                    VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE}
commit 134cefa6eefb145deb37f1b428b854b96692c446
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Jan 20 00:42:31 2013 +0100

    When the card id is unknown, don't check CLE266 revision if the chipset is not CLE266

diff --git a/src/via_id.c b/src/via_id.c
index 39ece3f..bba5792 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -309,5 +309,6 @@ ViaCheckCardId(ScrnInfoPtr pScrn)
                DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo), pScrn->chipset);
     pVia->Id = NULL;
 
-    ViaDoubleCheckCLE266Revision(pScrn);
+    if (pVia->Chipset == VIA_CLE266)
+        ViaDoubleCheckCLE266Revision(pScrn);
 }