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

Darxus darxus at chaosreigns.com
Mon Feb 11 11:49:09 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-nouveau
Builds, haven't tried running it.

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

diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index c7f769d..1e7005e 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -654,7 +654,7 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec,
 }
 
 #ifdef XORG_WAYLAND
-static int nouveau_auth_magic(ScreenPtr pScreen, uint32_t magic)
+static int nouveau_auth_magic(ClientPtr client, ScreenPtr pScreen, uint32_t magic)
 {
 	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 	NVPtr pNv = NVPTR(pScrn);
@@ -664,7 +664,7 @@ static int nouveau_auth_magic(ScreenPtr pScreen, uint32_t magic)
 		return drmAuthMagic(pNv->dev->fd, magic);
 
 	/* Forward the request to our host */
-	return xwl_drm_authenticate(pNv->xwl_screen, magic);
+	return xwl_drm_authenticate(client, pNv->xwl_screen, magic);
 }
 #endif
 
@@ -698,7 +698,7 @@ nouveau_dri2_init(ScreenPtr pScreen)
 	dri2.GetMSC = nouveau_dri2_get_msc;
 
 #if defined(XORG_WAYLAND)
-	dri2.AuthMagic2 = nouveau_auth_magic;
+	dri2.AuthMagic3 = nouveau_auth_magic;
 #endif
 
 #if DRI2INFOREC_VERSION >= 6
-- 
1.7.10.4



More information about the wayland-devel mailing list