[Mesa-dev] [PATCH] st/xorg: remove _modesettingRec.cursor

[Michel Dänzer]

On Mon, 2011-05-02 at 00:00 +0200, Marcin Slusarz wrote: 
> It's not used for anything useful.
> ---
>  src/gallium/state_trackers/xorg/xorg_crtc.c    |   13 -------------
>  src/gallium/state_trackers/xorg/xorg_driver.c  |    5 -----
>  src/gallium/state_trackers/xorg/xorg_tracker.h |    1 -
>  3 files changed, 0 insertions(+), 19 deletions(-)
> 
> diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
> index 8eaf414..b8d9474 100644
> --- a/src/gallium/state_trackers/xorg/xorg_crtc.c
> +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
> @@ -302,21 +302,8 @@ err_bo_destroy:
>  static void
>  crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image)
>  {
> -    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
>      modesettingPtr ms = modesettingPTR(crtc->scrn);
>  
> -    /* Older X servers have cursor reference counting bugs leading to use of
> -     * freed memory and consequently random crashes. Should be fixed as of
> -     * xserver 1.8, but this workaround shouldn't hurt anyway.
> -     */
> -    if (config->cursor)
> -       config->cursor->refcnt++;

configure.ac only requires xorg-server >= 1.6.0, so this still seems
necessary.


-- 
Earthling Michel Dänzer           |                http://www.vmware.com
Libre software enthusiast         |          Debian, X and DRI developer