xf86-video-intel: 2 commits - src/intel_module.c src/sna/sna_driver.c

[Chris Wilson]

 src/intel_module.c   |    9 ++++++++-
 src/sna/sna_driver.c |    8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 6c37ab3ddc5910fdf4ed663a8dc620edc9fec931
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Dec 4 11:55:54 2013 +0000

    sna: Print detected GPU first
    
    This should make the GPU identification easier to find in future.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 4a96faf..58037c0 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -509,6 +509,10 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 		goto cleanup;
 	}
 
+	intel_detect_chipset(scrn, pEnt);
+	xf86DrvMsg(scrn->scrnIndex, X_PROBED, "CPU: %s\n",
+		   sna_cpu_features_to_string(sna->cpu_features, buf));
+
 	preferred_depth = sna->info->gen < 030 ? 15 : 24;
 	if (!fb_supports_depth(fd, preferred_depth))
 		preferred_depth = 24;
@@ -546,8 +550,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 
 	sna_setup_capabilities(scrn, fd);
 
-	intel_detect_chipset(scrn, pEnt);
-
 	kgem_init(&sna->kgem, fd,
 		  xf86GetPciInfoForEntity(pEnt->index),
 		  sna->info->gen);
@@ -593,8 +595,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 	if (xf86ReturnOptValBool(sna->Options, OPTION_CRTC_PIXMAPS, FALSE))
 		sna->flags |= SNA_FORCE_SHADOW;
 
-	xf86DrvMsg(scrn->scrnIndex, X_PROBED, "CPU: %s\n",
-		   sna_cpu_features_to_string(sna->cpu_features, buf));
 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n",
 		   sna->tiling & SNA_TILING_FB ? "tiled" : "linear");
 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n",
commit 255025d8d342610ddc75f510ea795bf8785f1578
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Dec 4 11:06:08 2013 +0000

    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 at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index e4bd65b..d739aa7 100644
--- 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,