From 9ac8dd49e8633601f44dcf1b854ade97c481698c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <ssp@redhat.com>
Date: Sat, 19 Mar 2011 12:47:52 -0400
Subject: [PATCH 13/13] If qxl_pre_init() is called without a confScreen, just
 return FALSE.

Otherwise, the driver crashes when called from Xorg -configure.
---
 src/qxl_driver.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 670c7e6..fc6d2a2 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -1189,6 +1189,12 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags)
     int *linePitches = NULL;
     DisplayModePtr mode;
     unsigned int max_x = 0, max_y = 0;
+
+    /* In X server 1.7.5, Xorg -configure will cause this
+     * function to get called without a confScreen.
+     */
+    if (!pScrn->confScreen)
+	return FALSE;
     
     CHECK_POINT();
     
-- 
1.7.4.4