intel: Tidy up driver identification string

Split the identification strings between the older integrated graphic
chipsets and the more recent integrated processor graphics. This helps
to emphasis the recent branding and should reduce confusion about which
processors are supported by the driver.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index e4bd65b..d739aa7 100644 (file)
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -144,6 +144,9 @@ static const SymTabRec intel_chipsets[] = {
        {PCI_CHIP_G41_G,                        "G41"},
        {PCI_CHIP_B43_G,                        "B43"},
        {PCI_CHIP_B43_G1,                       "B43"},
+
+       {0, ""},
+
        {PCI_CHIP_IRONLAKE_D_G,                 "HD Graphics"},
        {PCI_CHIP_IRONLAKE_M_G,                 "HD Graphics"},
        {PCI_CHIP_SANDYBRIDGE_GT1,              "HD Graphics 2000" },
@@ -342,7 +345,7 @@ static void intel_identify(int flags)
        xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Integrated Graphics Chipsets:\n\t");
        len = 8;
 
-       for (chipset = intel_chipsets; chipset->name; chipset++) {
+       for (chipset = intel_chipsets; chipset->token; chipset++) {
                for (j = i; --j >= 0;)
                        if (strcmp(unique[j], chipset->name) == 0)
                                break;
@@ -384,6 +387,10 @@ static void intel_identify(int flags)
        xf86ErrorF("\n");
        if (unique != stack)
                free(unique);
+
+       xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) HD Graphics: 2000-5000\n");
+       xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Graphics: 5100\n");
+       xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Pro Graphics: 5200\n");
 }
 
 static Bool intel_driver_func(ScrnInfoPtr pScrn,