xf86-video-intel: src/intel_driver.c

[Chris Wilson]

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

New commits:
commit bc73acbd4da53bc50752c0413adcd0ce876e0a03
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 10 18:55:04 2012 +0100

    uxa: Error out after failing to become DRM master during PreInit
    
    As we set the card fd to -1 upon failure, the error here is
    non-recoverable, so make sure it gets propagated and we abort loading
    the intel ddx.
    
    Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/962892
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index 1b2c616..41f0311 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -505,9 +505,11 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
 
 	intel->PciInfo = xf86GetPciInfoForEntity(intel->pEnt->index);
 
-	if (!intel_open_drm_master(scrn))
+	if (!intel_open_drm_master(scrn)) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Failed to become DRM master.\n");
+		return FALSE;
+	}
 
 	scrn->monitor = scrn->confScreen->monitor;
 	scrn->progClock = TRUE;