sna: Do not attempt fallback configuration without any CRTCs
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 21 Feb 2014 19:43:30 +0000 (19:43 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 21 Feb 2014 19:44:05 +0000 (19:44 +0000)
The fallback xf86InitialConfiguration() is another function that may
explode if called without any CRTCs attached.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/sna_display.c

index 496a300..de08cb9 100644 (file)
@@ -3539,7 +3539,8 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
 
        if (!sna_probe_initial_configuration(sna)) {
                sanitize_outputs(sna);
-               xf86InitialConfiguration(scrn, TRUE);
+               if (XF86_CRTC_CONFIG_PTR(scrn)->num_crtc)
+                       xf86InitialConfiguration(scrn, TRUE);
        }
 
        sna_setup_provider(scrn);