diff options
| author | Tiago Vignatti <tiago.vignatti@intel.com> | 2013-02-08 14:57:02 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-02-08 12:18:38 -0500 |
| commit | bb4e7c69349ae1ea6aca36977e0d01bea2966564 (patch) | |
| tree | d6b620c5cbfb9df141ef9fe49848db0b8a4758f3 | |
| parent | 860e27c1c385993ae4df3e0a95967af1b388fd16 (diff) | |
| download | xorg-driver-xf86-video-intel-bb4e7c69349ae1ea6aca36977e0d01bea2966564.tar.gz | |
xwayland: Use new DRI2 AuthMagic3
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
| -rw-r--r-- | src/intel_dri.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/intel_dri.c b/src/intel_dri.c index 038940e8..f1a686c2 100644 --- a/src/intel_dri.c +++ b/src/intel_dri.c @@ -1512,7 +1512,8 @@ 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); @@ -1522,7 +1523,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 @@ -1611,7 +1612,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; info.GetMSC = NULL; info.ScheduleWaitMSC = NULL; #endif |