From 3bdf36476179257561b9409c3f49a77640fbb9f9 Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Wed, 16 Sep 2009 16:03:46 +0200 Subject: [PATCH] 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. --- hw/xfree86/modes/xf86Cursors.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index fc4df8477..f4b8be50b 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;