[PATCH xf86-video-vmware] vmwgfx: Use new DRI2 AuthMagic3 for xwayland

[Othmar Pasteka]

Good Morning,

I forgot to CC the vmware driver maintainer. Is this reply with
added CC ok or resubmit as v2?

Thanks,
Othmar Pasteka

On Sun, May 05, 2013 at 08:29:36PM +0200, Othmar Pasteka wrote:
> Update for http://cgit.freedesktop.org/xorg/xserver/commit/?h=xwayland-1.12&id=e4566c049c7b385e2307fef3c72ef61762729f42
> based on http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?h=xwayland&id=bb4e7c69349ae1ea6aca36977e0d01bea2966564
> 
> Signed-off-by: Othmar Pasteka <pasteka at kabsi.at>
> ---
> This is for the xwayland branch.
> Built and tested in a vmware player guest with wayland git.
> 
>  vmwgfx/vmwgfx_dri2.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
> index a53cadd..b6a4480 100644
> --- a/vmwgfx/vmwgfx_dri2.c
> +++ b/vmwgfx/vmwgfx_dri2.c
> @@ -373,7 +373,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
>  }
>  
>  #ifdef XORG_WAYLAND
> -static int dri2_auth_magic2(ScreenPtr pScreen, uint32_t magic)
> +static int dri2_auth_magic3(ClientPtr client, ScreenPtr pScreen, uint32_t magic)
>  {
>      ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
>      modesettingPtr ms = modesettingPTR(pScrn);
> @@ -383,7 +383,7 @@ static int dri2_auth_magic2(ScreenPtr pScreen, uint32_t magic)
>          return drmAuthMagic(ms->fd, magic);
>  
>      /* Forward the request to our host */
> -    return xwl_drm_authenticate(ms->xwl_screen, magic);
> +    return xwl_drm_authenticate(client, ms->xwl_screen, magic);
>  }
>  #endif
>  
> @@ -435,7 +435,7 @@ xorg_dri2_init(ScreenPtr pScreen)
>  
>  #ifdef XORG_WAYLAND
>      dri2info.version = 3;
> -    dri2info.AuthMagic2 = dri2_auth_magic2;
> +    dri2info.AuthMagic3 = dri2_auth_magic3;
>  #endif
>  
>      return DRI2ScreenInit(pScreen, &dri2info);
> -- 
> 1.7.10.4