DRM 20050615 import
This commit is contained in:
parent
6e301a8e97
commit
68e856ff5b
|
@ -62,8 +62,6 @@
|
|||
# ifdef DRM_USE_MALLOC
|
||||
# define _DRM_MALLOC malloc
|
||||
# define _DRM_FREE free
|
||||
extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
|
||||
extern int xf86RemoveSIGIOHandler(int fd);
|
||||
# else
|
||||
# include <X11/Xlibint.h>
|
||||
# define _DRM_MALLOC Xmalloc
|
||||
|
@ -106,10 +104,6 @@ extern unsigned long _bus_base(void);
|
|||
#define DRM_MAX_MINOR 16
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
#include <sys/sysmacros.h> /* for makedev() */
|
||||
#endif
|
||||
|
||||
#ifndef makedev
|
||||
/* This definition needs to be changed on
|
||||
some systems if dev_t is a structure.
|
||||
|
@ -2268,7 +2262,7 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined(XFree86Server) || defined(DRM_USE_MALLOC)
|
||||
#if defined(XFree86Server)
|
||||
static void drmSIGIOHandler(int interrupt, void *closure)
|
||||
{
|
||||
unsigned long key;
|
||||
|
|
|
@ -76,6 +76,7 @@
|
|||
# include <stdio.h>
|
||||
# include <stdlib.h>
|
||||
#else
|
||||
# include "drm.h"
|
||||
# include "xf86drm.h"
|
||||
# ifdef XFree86LOADER
|
||||
# include "xf86.h"
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
# include <stdio.h>
|
||||
# include <stdlib.h>
|
||||
#else
|
||||
# include "drm.h"
|
||||
# include "xf86drm.h"
|
||||
# ifdef XFree86LOADER
|
||||
# include "xf86.h"
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
# include <stdlib.h>
|
||||
# include <sys/time.h>
|
||||
#else
|
||||
# include "drm.h"
|
||||
# include "xf86drm.h"
|
||||
# ifdef XFree86LOADER
|
||||
# include "xf86.h"
|
||||
|
|
|
@ -104,7 +104,8 @@ typedef enum {
|
|||
DRM_REGISTERS = 1, /**< no caching, no core dump */
|
||||
DRM_SHM = 2, /**< shared, cached */
|
||||
DRM_AGP = 3, /**< AGP/GART */
|
||||
DRM_SCATTER_GATHER = 4 /**< PCI scatter/gather */
|
||||
DRM_SCATTER_GATHER = 4, /**< PCI scatter/gather */
|
||||
DRM_CONSISTENT = 5 /**< PCI consistent */
|
||||
} drmMapType;
|
||||
|
||||
typedef enum {
|
||||
|
@ -147,7 +148,8 @@ typedef enum {
|
|||
typedef enum {
|
||||
DRM_PAGE_ALIGN = 0x01,
|
||||
DRM_AGP_BUFFER = 0x02,
|
||||
DRM_SG_BUFFER = 0x04
|
||||
DRM_SG_BUFFER = 0x04,
|
||||
DRM_FB_BUFFER = 0x08
|
||||
} drmBufDescFlags;
|
||||
|
||||
typedef enum {
|
||||
|
@ -281,8 +283,8 @@ typedef struct _drmSetVersion {
|
|||
|
||||
#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
|
||||
|
||||
#define DRM_LOCK_HELD 0x80000000 /**< Hardware lock is held */
|
||||
#define DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */
|
||||
#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */
|
||||
#define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ >= 2)
|
||||
# if defined(__i386) || defined(__AMD64__)
|
||||
|
|
Loading…
Reference in New Issue
Block a user