xserver: Branch 'master'

[Matthias Hopf]

 hw/xfree86/modes/xf86Cursors.c |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 3bdf36476179257561b9409c3f49a77640fbb9f9
Author: Matthias Hopf <mhopf at suse.de>
Date:   Wed Sep 16 16:03:46 2009 +0200

    Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL.
    
    Apparently SavedCursor is sometime tried to be set while already being set.

diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index fc4df84..f4b8be5 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -461,6 +461,10 @@ xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
 
+    if (xf86_config->cursor == cursor) {
+	xf86DrvMsg(index, X_ERROR, "Trying to set already set cursor.\n");
+	return FALSE;
+    }
     if (xf86_config->cursor)
 	FreeCursor (xf86_config->cursor, None);
     xf86_config->cursor = cursor;
@@ -480,6 +484,10 @@ xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
     
+    if (xf86_config->cursor == cursor) {
+	xf86DrvMsg(index, X_ERROR, "Trying to set already set cursor.\n");
+	return FALSE;
+    }
     if (xf86_config->cursor)
 	FreeCursor (xf86_config->cursor, None);
     xf86_config->cursor = cursor;