sna: Do not register colormaps without any CRTCs

The xserver may crash if we try to setup colormap handling without any
CRTCs, so don't.

Suggested-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 01d34f8..ef30149 100644 (file)
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -1038,11 +1038,11 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
        if (!miCreateDefColormap(screen))
                return FALSE;
 
-       if (!xf86HandleColormaps(screen, 256, 8, sna_load_palette, NULL,
+       if (sna->mode.kmode->count_crtcs &&
+           !xf86HandleColormaps(screen, 256, 8, sna_load_palette, NULL,
                                 CMAP_RELOAD_ON_MODE_SWITCH |
-                                CMAP_PALETTED_TRUECOLOR)) {
+                                CMAP_PALETTED_TRUECOLOR))
                return FALSE;
-       }
 
        xf86DPMSInit(screen, xf86DPMSSet, 0);