Bug#510181: xserver-xorg-core: crash on startx when dri enabled after upgrade to xserver 1.5.3

[Sten Heinze <sten.heinze@gmx.de>]

Reading through the commit log for the mesa_7_2_branch I found that 
freedesktop.org bug #17766 [1] is exactly my bug and the patch at [2] fixes it. 
I attached the patch.

Thanks and regards,
Sten

[1] http://bugs.freedesktop.org/show_bug.cgi?id=17766
[2] 
http://cgit.freedesktop.org/mesa/mesa/commit/?h=mesa_7_2_branch&id=48c29b60a899877c76d643b9cd06d5277cd97b9c

From 48c29b60a899877c76d643b9cd06d5277cd97b9c Mon Sep 17 00:00:00 2001
From: Xiang, Haihao<haihao.xiang@intel.com>
Date: Tue, 21  Oct  2008  02:30:39  +0000
Subject: i915: fix carsh in i830_emit_state. (bug #17766)

---
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index c5a85fe..38f35dd 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -444,7 +444,8 @@ i830_emit_state(struct intel_context *intel)
    ret = 0;
    if (dirty & I830_UPLOAD_BUFFERS) {
      ret |= dri_bufmgr_check_aperture_space(state->draw_region->buffer);
-     ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer);
+     if (state->depth_region)
+         ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer);
    }
    
    for (i = 0; i < I830_TEX_UNITS; i++)
--
cgit v0.8.1-24-ge5fb