[PATCH v2 intel] xwayland: Use new DRI2 AuthMagic3

Tiago Vignatti tiago.vignatti at intel.com
Mon Feb 4 08:55:00 PST 2013


Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
 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



More information about the wayland-devel mailing list