geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdrm: add support for server side functionality in libdrm 

This adds APIs to allow the X server to use libdrm from the system
rather than its own in-built copy.
main
Dave Airlie 2006-11-08 15:08:09 +11:00
parent 584acab6d6
commit 79038751ff
4 changed files with 105 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([libdrm], 2.2.0, [dri-devel@lists.sourceforge.net], libdrm) AC_INIT([libdrm], 2.3.0, [dri-devel@lists.sourceforge.net], libdrm)
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])

2
libdrm/Makefile.am
View File

@ -20,7 +20,7 @@
libdrm_la_LTLIBRARIES = libdrm.la libdrm_la_LTLIBRARIES = libdrm.la
libdrm_ladir = $(libdir) libdrm_ladir = $(libdir)
libdrm_la_LDFLAGS = -version-number 2:0:0 -no-undefined libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined
AM_CFLAGS = -I$(top_srcdir)/shared-core AM_CFLAGS = -I$(top_srcdir)/shared-core
libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c

116
libdrm/xf86drm.c
View File

@ -35,17 +35,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86Server
# include "xf86.h"
# include "xf86_OSproc.h"
# include "drm.h"
# include "xf86_ansic.h"
# define _DRM_MALLOC xalloc
# define _DRM_FREE xfree
# ifndef XFree86LOADER
# include <sys/mman.h>
# endif
#else
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@ -64,11 +53,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/time.h> #include <sys/time.h>
#include <stdarg.h> #include <stdarg.h>
# define _DRM_MALLOC malloc
# define _DRM_FREE free
#include "drm.h" #include "drm.h"
#endif
/* Not all systems have MAP_FAILED defined */ /* Not all systems have MAP_FAILED defined */
#ifndef MAP_FAILED #ifndef MAP_FAILED
@ -107,6 +92,13 @@
#define DRM_MSG_VERBOSITY 3 #define DRM_MSG_VERBOSITY 3
static drmServerInfoPtr drm_server_info;
void drmSetServerInfo(drmServerInfoPtr info)
{
drm_server_info = info;
}
/** /**
* Output a message to stderr. * Output a message to stderr.
* *
@ -115,44 +107,54 @@
* \internal * \internal
* This function is a wrapper around vfprintf(). * This function is a wrapper around vfprintf().
*/ */
static int drmDebugPrint(const char *format, va_list ap)
{
return vfprintf(stderr, format, ap);
}
static int (*drm_debug_print)(const char *format, va_list ap) = drmDebugPrint;
static void static void
drmMsg(const char *format, ...) drmMsg(const char *format, ...)
{ {
va_list ap; va_list ap;
#ifndef XFree86Server
const char *env; const char *env;
if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose")) if (((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose")) || drm_server_info)
#endif
{ {
va_start(ap, format); va_start(ap, format);
#ifdef XFree86Server if (drm_server_info) {
xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); drm_server_info->debug_print(format,ap);
#else } else {
vfprintf(stderr, format, ap); drm_debug_print(format, ap);
#endif }
va_end(ap); va_end(ap);
} }
} }
void
drmSetDebugMsgFunction(int (*debug_msg_ptr)(const char *format, va_list ap))
{
drm_debug_print = debug_msg_ptr;
}
static void *drmHashTable = NULL; /* Context switch callbacks */ static void *drmHashTable = NULL; /* Context switch callbacks */
typedef struct drmHashEntry { void *drmGetHashTable(void)
int fd; {
void (*f)(int, void *, void *); return drmHashTable;
void *tagTable; }
} drmHashEntry;
void *drmMalloc(int size) void *drmMalloc(int size)
{ {
void *pt; void *pt;
if ((pt = _DRM_MALLOC(size))) memset(pt, 0, size); if ((pt = malloc(size))) memset(pt, 0, size);
return pt; return pt;
} }
void drmFree(void *pt) void drmFree(void *pt)
{ {
if (pt) _DRM_FREE(pt); if (pt) free(pt);
} }
/* drmStrdup can't use strdup(3), since it doesn't call _DRM_MALLOC... */ /* drmStrdup can't use strdup(3), since it doesn't call _DRM_MALLOC... */
@ -163,7 +165,7 @@ static char *drmStrdup(const char *s)
if (!s) if (!s)
return NULL; return NULL;
retval = _DRM_MALLOC(strlen(s)+1); retval = malloc(strlen(s)+1);
if (!retval) if (!retval)
return NULL; return NULL;
@ -182,7 +184,7 @@ static unsigned long drmGetKeyFromFd(int fd)
return st.st_rdev; return st.st_rdev;
} }
static drmHashEntry *drmGetEntry(int fd) drmHashEntry *drmGetEntry(int fd)
{ {
unsigned long key = drmGetKeyFromFd(fd); unsigned long key = drmGetKeyFromFd(fd);
void *value; void *value;
@ -269,21 +271,20 @@ static int drmOpenDevice(long dev, int minor)
stat_t st; stat_t st;
char buf[64]; char buf[64];
int fd; int fd;
mode_t devmode = DRM_DEV_MODE; mode_t devmode = DRM_DEV_MODE, serv_mode;
int isroot = !geteuid(); int isroot = !geteuid();
#if defined(XFree86Server)
uid_t user = DRM_DEV_UID; uid_t user = DRM_DEV_UID;
gid_t group = DRM_DEV_GID; gid_t group = DRM_DEV_GID, serv_group;
#endif
sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor);
drmMsg("drmOpenDevice: node name is %s\n", buf); drmMsg("drmOpenDevice: node name is %s\n", buf);
#if defined(XFree86Server) if (drm_server_info) {
devmode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE; drm_server_info->get_perms(&serv_group, &serv_mode);
devmode = serv_mode ? serv_mode : DRM_DEV_MODE;
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID; group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
#endif }
if (stat(DRM_DIR_NAME, &st)) { if (stat(DRM_DIR_NAME, &st)) {
if (!isroot) return DRM_ERR_NOT_ROOT; if (!isroot) return DRM_ERR_NOT_ROOT;
@ -298,10 +299,11 @@ static int drmOpenDevice(long dev, int minor)
remove(buf); remove(buf);
mknod(buf, S_IFCHR | devmode, dev); mknod(buf, S_IFCHR | devmode, dev);
} }
#if defined(XFree86Server)
if (drm_server_info) {
chown(buf, user, group); chown(buf, user, group);
chmod(buf, devmode); chmod(buf, devmode);
#endif }
fd = open(buf, O_RDWR, 0); fd = open(buf, O_RDWR, 0);
drmMsg("drmOpenDevice: open result is %d, (%s)\n", drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@ -315,10 +317,10 @@ static int drmOpenDevice(long dev, int minor)
if (!isroot) return DRM_ERR_NOT_ROOT; if (!isroot) return DRM_ERR_NOT_ROOT;
remove(buf); remove(buf);
mknod(buf, S_IFCHR | devmode, dev); mknod(buf, S_IFCHR | devmode, dev);
#if defined(XFree86Server) if (drm_server_info) {
chown(buf, user, group); chown(buf, user, group);
chmod(buf, devmode); chmod(buf, devmode);
#endif }
} }
fd = open(buf, O_RDWR, 0); fd = open(buf, O_RDWR, 0);
drmMsg("drmOpenDevice: open result is %d, (%s)\n", drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@ -456,16 +458,16 @@ static int drmOpenByName(const char *name)
char * id; char * id;
if (!drmAvailable()) { if (!drmAvailable()) {
#if !defined(XFree86Server) if (!drm_server_info)
return -1; return -1;
#else else {
/* try to load the kernel module now */ /* try to load the kernel module now */
if (!xf86LoadKernelModule(name)) { if (!drm_server_info->load_module(name)) {
ErrorF("[drm] failed to load kernel module \"%s\"\n", drmMsg("[drm] failed to load kernel module \"%s\"\n",
name); name);
return -1; return -1;
} }
#endif }
} }
/* /*
@ -547,16 +549,14 @@ static int drmOpenByName(const char *name)
*/ */
int drmOpen(const char *name, const char *busid) int drmOpen(const char *name, const char *busid)
{ {
#ifdef XFree86Server if (!drmAvailable() && name != NULL && drm_server_info) {
if (!drmAvailable() && name != NULL) {
/* try to load the kernel */ /* try to load the kernel */
if (!xf86LoadKernelModule(name)) { if (!drm_server_info->load_module(name)) {
ErrorF("[drm] failed to load kernel module \"%s\"\n", drmMsg("[drm] failed to load kernel module \"%s\"\n",
name); name);
return -1; return -1;
} }
} }
#endif
if (busid) { if (busid) {
int fd; int fd;
@ -710,15 +710,17 @@ drmVersionPtr drmGetLibVersion(int fd)
drm_version_t *version = drmMalloc(sizeof(*version)); drm_version_t *version = drmMalloc(sizeof(*version));
/* Version history: /* Version history:
* NOTE THIS MUST NOT GO ABOVE VERSION 1.X due to drivers needing it
* revision 1.0.x = original DRM interface with no drmGetLibVersion * revision 1.0.x = original DRM interface with no drmGetLibVersion
* entry point and many drm<Device> extensions * entry point and many drm<Device> extensions
* revision 1.1.x = added drmCommand entry points for device extensions * revision 1.1.x = added drmCommand entry points for device extensions
* added drmGetLibVersion to identify libdrm.a version * added drmGetLibVersion to identify libdrm.a version
* revision 1.2.x = added drmSetInterfaceVersion * revision 1.2.x = added drmSetInterfaceVersion
* modified drmOpen to handle both busid and name * modified drmOpen to handle both busid and name
* revision 1.3.x = added server + memory manager
*/ */
version->version_major = 2; version->version_major = 1;
version->version_minor = 2; version->version_minor = 3;
version->version_patchlevel = 0; version->version_patchlevel = 0;
return (drmVersionPtr)version; return (drmVersionPtr)version;

18
libdrm/xf86drm.h
View File

@ -36,6 +36,8 @@
#ifndef _XF86DRM_H_ #ifndef _XF86DRM_H_
#define _XF86DRM_H_ #define _XF86DRM_H_
#include <stdarg.h>
#include <sys/types.h>
#include <drm.h> #include <drm.h>
/* Defaults, if nothing set in xf86config */ /* Defaults, if nothing set in xf86config */
@ -61,6 +63,21 @@
typedef unsigned int drmSize, *drmSizePtr; /**< For mapped regions */ typedef unsigned int drmSize, *drmSizePtr; /**< For mapped regions */
typedef void *drmAddress, **drmAddressPtr; /**< For mapped regions */ typedef void *drmAddress, **drmAddressPtr; /**< For mapped regions */
typedef struct _drmServerInfo {
int (*debug_print)(const char *format, va_list ap);
int (*load_module)(const char *name);
void (*get_perms)(gid_t *, mode_t *);
} drmServerInfo, *drmServerInfoPtr;
typedef struct drmHashEntry {
int fd;
void (*f)(int, void *, void *);
void *tagTable;
} drmHashEntry;
extern void *drmGetHashTable(void);
extern drmHashEntry *drmGetEntry(int fd);
/** /**
* Driver version information. * Driver version information.
* *
@ -604,6 +621,7 @@ extern int drmScatterGatherFree(int fd, drm_handle_t handle);
extern int drmWaitVBlank(int fd, drmVBlankPtr vbl); extern int drmWaitVBlank(int fd, drmVBlankPtr vbl);
/* Support routines */ /* Support routines */
extern void drmSetServerInfo(drmServerInfoPtr info);
extern int drmError(int err, const char *label); extern int drmError(int err, const char *label);
extern void *drmMalloc(int size); extern void *drmMalloc(int size);
extern void drmFree(void *pt); extern void drmFree(void *pt);