xf86-video-intel: src/intel_module.c

Chris Wilson ickle at kemper.freedesktop.org
Tue Sep 11 07:00:58 PDT 2012


 src/intel_module.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 15911f533d6a7ef40e42ba5921fac7c62b290f8b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Sep 11 14:59:53 2012 +0100

    prime: Reorder probe messages so that the driver prefix is correct
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index b4f0ad2..65a91b1 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -557,19 +557,19 @@ intel_platform_probe(DriverPtr driver,
 	if (scrn == NULL)
 		return FALSE;
 
-	xf86DrvMsg(scrn->scrnIndex, X_INFO,
-		   "using device path '%s'\n", path ? path : "Default device");
-
-	if (xf86IsEntitySharable(entity_num))
-		xf86SetEntityShared(entity_num);
-	xf86AddEntityToScreen(scrn, entity_num);
-
 	scrn->driverVersion = INTEL_VERSION;
 	scrn->driverName = INTEL_DRIVER_NAME;
 	scrn->name = INTEL_NAME;
 	scrn->driverPrivate = (void *)(match_data | 1);
 	scrn->Probe = NULL;
 
+	if (xf86IsEntitySharable(entity_num))
+		xf86SetEntityShared(entity_num);
+	xf86AddEntityToScreen(scrn, entity_num);
+
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
+		   "using device path '%s'\n", path ? path : "Default device");
+
 	switch (get_accel_method()) {
 #if USE_SNA
         case SNA: return sna_init_scrn(scrn, entity_num);


More information about the xorg-commit mailing list