diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-10 18:55:04 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-10 18:55:04 +0100 |
| commit | bc73acbd4da53bc50752c0413adcd0ce876e0a03 (patch) | |
| tree | 10772986e5715517fd4858a16004bae8c4dfc2e6 /src/intel_driver.c | |
| parent | b0d14071f7b60729c223af925935227393fbd3ee (diff) | |
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@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.c')
| -rw-r--r-- | src/intel_driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 1b2c6167..41f03117 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; |