diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-05-02 20:01:56 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-05-02 20:01:56 +0100 |
commit | e422335ee7e950236c478eeefa1fc5cde90fd3aa (patch) | |
tree | 42779d17566d08e6980b36c9733353feb58b80c5 /gdri-cmdq-submission.c | |
parent | 26353be0247589e048198ebcf841629540945bc9 (diff) |
Move authentication to a common file
Diffstat (limited to 'gdri-cmdq-submission.c')
-rw-r--r-- | gdri-cmdq-submission.c | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/gdri-cmdq-submission.c b/gdri-cmdq-submission.c index 40dfcc9..a78093b 100644 --- a/gdri-cmdq-submission.c +++ b/gdri-cmdq-submission.c @@ -23,14 +23,7 @@ #include <stdio.h> #include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/Xmd.h> #include <stdint.h> @@ -39,54 +32,9 @@ #include "dri2.h" #include "glamo-regs.h" +#include "utils.h" -#define RING_LOCALS int __count = 0; -#define OUT_REG(reg, val) cmds[__count++] = (reg); cmds[__count++] = (val); - - -static int do_drm_authentication(Display *dpy) -{ - int scrnum; - Window root; - char *driver; - char *device; - int fd; - drm_magic_t magic; - - /* Get default screen, root window and default visual */ - scrnum = DefaultScreen(dpy); - root = RootWindow(dpy, scrnum); - - /* Get device name */ - if ( !DRI2Connect(dpy, root, &driver, &device) ) { - fprintf(stderr, "DRI2Connect failed\n"); - return -1; - } - - /* Open DRM device */ - fd = open(device, O_RDWR); - if ( fd < 0 ) { - fprintf(stderr, "Couldn't open '%s': %s\n", - device, strerror(errno)); - return -1; - } - - /* Get an authentication token */ - if ( drmGetMagic(fd, &magic) ) { - fprintf(stderr, "drmGetMagic failed\n"); - return -1; - } - - /* Authenticate */ - if ( DRI2Authenticate(dpy, root, magic) == False ) { - fprintf(stderr, "DRI2Authenticate failed\n"); - return -1; - } - - return fd; -} - int main() { Display *dpy; |