[PATCH xf86-video-ati] xwayland: Use new DRI2 AuthMagic3

Darxus darxus at chaosreigns.com
Mon Feb 11 11:40:46 PST 2013


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

---
Patch is for https://github.com/RAOF/xf86-video-ati/tree/xwayland
Builds, haven't tried running it.

 src/radeon_dri2.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 7f1f637..405f312 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -1312,7 +1312,7 @@ blit_fallback:
 
 
 #ifdef XORG_WAYLAND
-static int radeon_auth_magic(ScreenPtr pScreen, uint32_t magic)
+static int radeon_auth_magic(ClientPtr client, ScreenPtr pScreen, uint32_t magic)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
 	RADEONInfoPtr info = RADEONPTR(scrn);
@@ -1322,7 +1322,7 @@ static int radeon_auth_magic(ScreenPtr pScreen, uint32_t magic)
 		return drmAuthMagic(info->dri2.drm_fd, magic);
 
 	/* Forward the request to our host */
-	return xwl_drm_authenticate(info->xwl_screen, magic);
+	return xwl_drm_authenticate(client, info->xwl_screen, magic);
 }
 #endif
 
@@ -1428,7 +1428,7 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
 #endif
 
 #if defined(XORG_WAYLAND)
-	dri2_info.AuthMagic2 = radeon_auth_magic;
+	dri2_info.AuthMagic3 = radeon_auth_magic;
 #endif
 	
     info->dri2.enabled = DRI2ScreenInit(pScreen, &dri2_info);
-- 
1.7.10.4



More information about the wayland-devel mailing list