xserver: Branch 'master'

[Keith Packard]

Excerpts from Daniel Stone's message of Mon Sep 21 07:51:12 -0700 2009:
> 
> Could you please run these commits past xorg-devel@ rather than
> committing directly, particularly if they're purely speculative and/or
> known to have problems, given that we're frozen and meant to be
> releasing two weeks from now?

In particular, this patch should be sufficient:

diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index fc4df84..385848b 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -480,10 +480,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;
     
+    ++cursor->refcnt;
     if (xf86_config->cursor)
 	FreeCursor (xf86_config->cursor, None);
     xf86_config->cursor = cursor;
-    ++cursor->refcnt;
     
     /* Make sure ARGB support is available */
     if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
-- 
keith.packard at intel.com