[Mesa-dev] [PATCH] egl: fix drm magic misnomer

[nobled]

Somehow this got propagated out from the Wayland stuff.
---
 src/egl/drivers/dri2/egl_dri2.h                    |    2 +-
 src/egl/drivers/dri2/platform_drm.c                |    4 ++--
 src/egl/drivers/dri2/platform_wayland.c            |    4 ++--
 src/egl/drivers/dri2/platform_x11.c                |    4 ++--
 .../wayland/wayland-drm/protocol/wayland-drm.xml   |    2 +-
 src/egl/wayland/wayland-drm/wayland-drm.c          |    4 ++--
 src/egl/wayland/wayland-drm/wayland-drm.h          |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 99f990a..bb52396 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -91,7 +91,7 @@ struct dri2_egl_display
    int			     authenticated;
 #endif

-   int (*authenticate) (_EGLDisplay *disp, uint32_t id);
+   int (*authenticate) (_EGLDisplay *disp, uint32_t magic);
 };

 struct dri2_egl_context
diff --git a/src/egl/drivers/dri2/platform_drm.c
b/src/egl/drivers/dri2/platform_drm.c
index 9c6d3dd..29e8ec2 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -663,11 +663,11 @@ dri2_get_driver_for_fd(int fd)
 }

 static int
-dri2_drm_authenticate(_EGLDisplay *disp, uint32_t id)
+dri2_drm_authenticate(_EGLDisplay *disp, uint32_t magic)
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);

-   return drmAuthMagic(dri2_dpy->fd, id);
+   return drmAuthMagic(dri2_dpy->fd, magic);
 }

 EGLBoolean
diff --git a/src/egl/drivers/dri2/platform_wayland.c
b/src/egl/drivers/dri2/platform_wayland.c
index 030c687..63bfcc4 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -581,14 +581,14 @@ dri2_wayland_create_image_khr(_EGLDriver *drv,
_EGLDisplay *disp,
 }

 static int
-dri2_wayland_authenticate(_EGLDisplay *disp, uint32_t id)
+dri2_wayland_authenticate(_EGLDisplay *disp, uint32_t magic)
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
    int ret = 0;

    dri2_dpy->authenticated = false;

-   wl_drm_authenticate(dri2_dpy->wl_drm, id);
+   wl_drm_authenticate(dri2_dpy->wl_drm, magic);
    force_roundtrip(dri2_dpy->wl_dpy);

    if (!dri2_dpy->authenticated)
diff --git a/src/egl/drivers/dri2/platform_x11.c
b/src/egl/drivers/dri2/platform_x11.c
index 5d4ac6a..4e9294e 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -552,7 +552,7 @@ dri2_connect(struct dri2_egl_display *dri2_dpy)
 }

 static int
-dri2_x11_authenticate(_EGLDisplay *disp, uint32_t id)
+dri2_x11_authenticate(_EGLDisplay *disp, uint32_t magic)
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
    xcb_dri2_authenticate_reply_t *authenticate;
@@ -562,7 +562,7 @@ dri2_x11_authenticate(_EGLDisplay *disp, uint32_t id)

    s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
    authenticate_cookie =
-      xcb_dri2_authenticate_unchecked(dri2_dpy->conn, s.data->root, id);
+      xcb_dri2_authenticate_unchecked(dri2_dpy->conn, s.data->root, magic);
    authenticate =
       xcb_dri2_authenticate_reply(dri2_dpy->conn, authenticate_cookie, NULL);

diff --git a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
index cd5d191..86f5ef0 100644
--- a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
+++ b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
@@ -8,7 +8,7 @@
          DRIAuthConnection() call.  This authentication must be
          completed before create_buffer could be used. -->
     <request name="authenticate">
-      <arg name="id" type="uint"/>
+      <arg name="magic" type="uint"/>
     </request>

     <!-- Create a wayland buffer for the named DRM buffer.  The DRM
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c
b/src/egl/wayland/wayland-drm/wayland-drm.c
index 3d5cb39..03b47aa 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -145,9 +145,9 @@ drm_create_buffer(struct wl_client *client, struct
wl_drm *drm,

 static void
 drm_authenticate(struct wl_client *client,
-		 struct wl_drm *drm, uint32_t id)
+		 struct wl_drm *drm, uint32_t magic)
 {
-	if (drm->authenticate(drm->edisp, id) < 0)
+	if (drm->authenticate(drm->edisp, magic) < 0)
 		wl_client_post_event(client,
 				     (struct wl_object *) drm->display,
 				     WL_DISPLAY_INVALID_OBJECT, 0);
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.h
b/src/egl/wayland/wayland-drm/wayland-drm.h
index 675a6a5..d235340 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.h
+++ b/src/egl/wayland/wayland-drm/wayland-drm.h
@@ -8,7 +8,7 @@

 struct wl_drm;

-typedef int (*authenticate_t) (_EGLDisplay *disp, uint32_t id);
+typedef int (*authenticate_t) (_EGLDisplay *disp, uint32_t magic);

 struct wl_drm_buffer {
 	struct wl_buffer buffer;
-- 
1.7.0.4