mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-15 06:59:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement current drm auth scheme in the drm object

Browse source
This commit is contained in:
Kristian Høgsberg 2010-08-09 22:11:47 -04:00
parent 3862e43779
commit 640609acfc
5 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
clients/window.c
View file

@ -31,6 +31,7 @@
#include <cairo.h>
#include <glib.h>
#include <glib-object.h>
#include <xf86drm.h>
#define EGL_EGLEXT_PROTOTYPES 1
#define GL_GLEXT_PROTOTYPES 1
@ -56,6 +57,7 @@ struct display {
struct wl_drm *drm;
struct wl_output *output;
struct rectangle screen_allocation;
int authenticated;
EGLDisplay dpy;
EGLContext ctx;
cairo_device_t *device;
@ -694,6 +696,9 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device)
static void drm_handle_authenticated(void *data, struct wl_drm *drm)
{
struct display *d = data;
d->authenticated = 1;
}
static const struct wl_drm_listener drm_listener = {
@ -865,6 +870,7 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
int fd;
GOptionContext *context;
GError *error;
drm_magic_t magic;
g_type_init();
@ -902,6 +908,17 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
return NULL;
}
if (drmGetMagic(fd, &magic)) {
fprintf(stderr, "DRI2: failed to get drm magic");
return NULL;
}
/* Wait for authenticated event */
wl_drm_authenticate(d->drm, magic);
wl_display_iterate(d->display, WL_DISPLAY_WRITABLE);
while (!d->authenticated)
wl_display_iterate(d->display, WL_DISPLAY_READABLE);
d->dpy = eglGetDRMDisplayMESA(fd);
if (!eglInitialize(d->dpy, &major, &minor)) {
fprintf(stderr, "failed to initialize display\n");