[PATCH v3 intel] xwayland: Use new DRI2 AuthMagic3

[Kristian Høgsberg]

On Wed, Feb 06, 2013 at 03:09:19PM +0200, Tiago Vignatti wrote:
> Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
> ---
> v3: (nil)

This patch is straightforward, except it doesn't apply against the
upstream xwayland branch:

commit 860e27c1c385993ae4df3e0a95967af1b388fd16
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Mon Sep 24 15:01:09 2012 -0400

    xwayland: Add xwayland support

Upstream branch has:

#if defined(XORG_WAYLAND) /* If we have XORG_WAYLAND, we have AuthMagic3 */
	info.version = 4;
        info.AuthMagic2 = intel_auth_magic2;
        info.GetMSC = NULL;
        info.ScheduleWaitMSC = NULL;
#endif

but I can rebase it as I apply, so don't worry about that.

Kristian

>  src/intel_dri.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/intel_dri.c b/src/intel_dri.c
> index fa04e18..7c0d25d 100644
> --- a/src/intel_dri.c
> +++ b/src/intel_dri.c
> @@ -1617,7 +1617,7 @@ out_complete:
>  }
>  
>  #ifdef XORG_WAYLAND
> -static int intel_auth_magic2(ScreenPtr screen, uint32_t magic)
> +static int intel_auth_magic3(ClientPtr client, ScreenPtr screen, uint32_t magic)
>  {
>  	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
>  	intel_screen_private *intel = intel_get_screen_private(scrn);
> @@ -1627,7 +1627,7 @@ static int intel_auth_magic2(ScreenPtr screen, uint32_t magic)
>  		return drmAuthMagic(intel->drmSubFD, magic);
>  
>  	/* Forward the request to our host */
> -	return xwl_drm_authenticate(intel->xwl_screen, magic);
> +	return xwl_drm_authenticate(client, intel->xwl_screen, magic);
>  }
>  #endif
>  
> @@ -1718,7 +1718,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
>  
>  #if defined(XORG_WAYLAND) /* If we have XORG_WAYLAND, we have AuthMagic2 */
>  	info.version = 4;
> -	info.AuthMagic2 = intel_auth_magic2;
> +	info.AuthMagic3 = intel_auth_magic3;
>  #endif
>  
>  	return DRI2ScreenInit(screen, &info);
> -- 
> 1.7.9.5
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel