summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/xfree86/os-support/drm/xf86drm.c8
-rw-r--r--hw/xfree86/os-support/drm/xf86drmHash.c1
-rw-r--r--hw/xfree86/os-support/drm/xf86drmRandom.c1
-rw-r--r--hw/xfree86/os-support/drm/xf86drmSL.c1
-rw-r--r--hw/xfree86/os-support/xf86drm.h10
5 files changed, 10 insertions, 11 deletions
diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c
index 2b0b1b9cc..e79794b3f 100644
--- a/hw/xfree86/os-support/drm/xf86drm.c
+++ b/hw/xfree86/os-support/drm/xf86drm.c
@@ -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;
diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c
index 1f1a05b3a..368dfe214 100644
--- a/hw/xfree86/os-support/drm/xf86drmHash.c
+++ b/hw/xfree86/os-support/drm/xf86drmHash.c
@@ -76,6 +76,7 @@
# include <stdio.h>
# include <stdlib.h>
#else
+# include "drm.h"
# include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h"
diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c
index 9e1e9ee2c..8db57a506 100644
--- a/hw/xfree86/os-support/drm/xf86drmRandom.c
+++ b/hw/xfree86/os-support/drm/xf86drmRandom.c
@@ -79,6 +79,7 @@
# include <stdio.h>
# include <stdlib.h>
#else
+# include "drm.h"
# include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h"
diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c
index dd634c30f..41e36a735 100644
--- a/hw/xfree86/os-support/drm/xf86drmSL.c
+++ b/hw/xfree86/os-support/drm/xf86drmSL.c
@@ -47,6 +47,7 @@
# include <stdlib.h>
# include <sys/time.h>
#else
+# include "drm.h"
# include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h"
diff --git a/hw/xfree86/os-support/xf86drm.h b/hw/xfree86/os-support/xf86drm.h
index 0b6e93fd3..7521e3415 100644
--- a/hw/xfree86/os-support/xf86drm.h
+++ b/hw/xfree86/os-support/xf86drm.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__)