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

[Chris Wilson]

 src/intel_module.c    |    4 +---
 src/sna/sna_display.c |   11 ++++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 2aacfbaa5143568906e88e489c72f4ebf065a4ec
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Mar 7 09:10:32 2013 +0000

    sna: Return early if there are no outputs to setup
    
    Instead of reporting failure, just try to run headless.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 2768424..30160a5 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2642,14 +2642,11 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
 	list_init(&mode->crtcs);
 	list_init(&mode->outputs);
 
-	xf86CrtcConfigInit(scrn, &sna_crtc_config_funcs);
-
 	mode->kmode = drmModeGetResources(sna->kgem.fd);
-	if (!mode->kmode) {
-		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
-			   "failed to get resources: %s\n", strerror(errno));
-		return false;
-	}
+	if (!mode->kmode)
+		return true;
+
+	xf86CrtcConfigInit(scrn, &sna_crtc_config_funcs);
 
 	set_size_range(sna);
 
commit b84db39edb6ebce965c1354dc5994bf0a70cea92
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Mar 7 09:07:19 2013 +0000

    intel: Relax the has-kms test slightly
    
    Do not rely on a fully populated set of CRTCs, but merely note that the
    GETRESOURCES ioctl returns an error if KMS is not enabled.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index bd9b9bb..4434ed0 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -423,9 +423,7 @@ static Bool has_kernel_mode_setting(const struct pci_device *dev)
 			struct drm_mode_card_res res;
 
 			memset(&res, 0, sizeof(res));
-			if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res) == 0)
-				ret = res.count_crtcs != 0;
-			else
+			if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
 				ret = FALSE;
 		}
 		close(fd);