fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-05 12:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reserve the new IOCTLs also for *bsd.

Browse source 
Bump libdrm version number to 2.2.0
This commit is contained in:
Thomas Hellstrom 2006-10-27 13:08:31 +02:00
parent f6d5fecdd2
commit decacb2e64
3 changed files with 2 additions and 11 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.
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])

6
libdrm/xf86drm.c
View file

@ -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

5
shared-core/drm.h
View file

@ -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)