summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-10-27 13:08:31 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-10-27 13:08:31 +0200
commitdecacb2e6415029fe87a3680c8f967483ba05281 (patch)
tree54018bd91f4e0842848221c59e0e8eb5d2053c7a
parentf6d5fecdd20b9fd9e8744d8f43fa276b73a1da78 (diff)
Reserve the new IOCTLs also for *bsd.
Bump libdrm version number to 2.2.0
-rw-r--r--configure.ac2
-rw-r--r--libdrm/xf86drm.c6
-rw-r--r--shared-core/drm.h5
3 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index b5d79456..224f43a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.57)
-AC_INIT([libdrm], 2.1.2-mm, [dri-devel@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm], 2.2.0, [dri-devel@lists.sourceforge.net], libdrm)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index ebf3f834..df41d77a 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -717,7 +717,7 @@ drmVersionPtr drmGetLibVersion(int fd)
* revision 1.2.x = added drmSetInterfaceVersion
* modified drmOpen to handle both busid and name
*/
- version->version_major = 1;
+ version->version_major = 2;
version->version_minor = 2;
version->version_patchlevel = 0;
@@ -2257,7 +2257,6 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data,
return 0;
}
-#ifdef __linux__
/*
* Valid flags are
@@ -3216,6 +3215,3 @@ int drmMMUnlock(int fd, unsigned memType)
return ret;
}
-
-
-#endif
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 330aa3ff..16e86267 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -660,7 +660,6 @@ typedef struct drm_set_version {
int drm_dd_minor;
} drm_set_version_t;
-#ifdef __linux__
#define DRM_FENCE_FLAG_EMIT 0x00000001
#define DRM_FENCE_FLAG_SHAREABLE 0x00000002
@@ -844,8 +843,6 @@ typedef union drm_mm_init_arg{
unsigned expand_pad[8]; /*Future expansion */
} rep;
} drm_mm_init_arg_t;
-#endif
-
/**
* \name Ioctls Definitions
@@ -912,11 +909,9 @@ typedef union drm_mm_init_arg{
#define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, drm_wait_vblank_t)
-#ifdef __linux__
#define DRM_IOCTL_FENCE DRM_IOWR(0x3b, drm_fence_arg_t)
#define DRM_IOCTL_BUFOBJ DRM_IOWR(0x3d, drm_bo_arg_t)
#define DRM_IOCTL_MM_INIT DRM_IOWR(0x3e, drm_mm_init_arg_t)
-#endif
#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, drm_update_draw_t)