frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Matthias Hopf 2009-09-16 16:03:46 +02:00
parent fe31f9c646
commit 3bdf364761
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/modes/xf86Cursors.c
View File

@ -461,6 +461,10 @@ xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; 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) if (xf86_config->cursor)
FreeCursor (xf86_config->cursor, None); FreeCursor (xf86_config->cursor, None);
xf86_config->cursor = cursor; 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); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; 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) if (xf86_config->cursor)
FreeCursor (xf86_config->cursor, None); FreeCursor (xf86_config->cursor, None);
xf86_config->cursor = cursor; xf86_config->cursor = cursor;