xf86-video-intel: 2 commits - src/intel_display.c src/sna/gen5_render.c

[Chris Wilson]

 src/intel_display.c   |    3 +++
 src/sna/gen5_render.c |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit addfa653cf51fa45c7eae49be1fd722aaadf97d6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 26 08:59:18 2012 +0100

    uxa: Prevent attempting to call intel_mode_fini() before PreInit runs
    
    In the Ubuntu xserver it is apparently possible for the Screen to be
    deleted prior to being fully initialised. Make sure we don't crash in
    that situation!
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55346
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index 2a3a393..60af415 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -1770,6 +1770,9 @@ intel_mode_fini(intel_screen_private *intel)
 {
 	struct intel_mode *mode = intel->modes;
 
+	if (mode == NULL)
+		return;
+
 	while(!list_is_empty(&mode->crtcs)) {
 		xf86CrtcDestroy(list_first_entry(&mode->crtcs,
 						 struct intel_crtc,
commit b880d8e0a9a32acd50333f72d695268c4819c29e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Sep 25 16:59:20 2012 +0100

    sna/gen5: Add WA reference
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index a141766..afd729e 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -3506,7 +3506,9 @@ gen5_render_context_switch(struct kgem *kgem,
 	if (!kgem->mode)
 		return;
 
-	/* Ironlake has a limitation that a 3D or Media command can't
+	/* WaNonPipelinedStateCommandFlush
+	 *
+	 * Ironlake has a limitation that a 3D or Media command can't
 	 * be the first command after a BLT, unless it's
 	 * non-pipelined.
 	 *