diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-07-15 20:21:18 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-07-15 20:21:18 +0000 |
| commit | eef49a73b541d69be5da9b289deff36f5bb96ab0 (patch) | |
| tree | 0cc0fa5559d7bf87c25d277ef63d816d0090ccf4 /libdrm | |
| parent | deb296f395bb16ef7cf4bfe48f6e6c2cbacea0bc (diff) | |
Merge trunk into r200-branchr200-0-1-20020715
Diffstat (limited to 'libdrm')
| -rw-r--r-- | libdrm/xf86drm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 9cc83a275..b5375ee55 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -1381,7 +1381,8 @@ int drmCommandRead(int fd, unsigned long drmCommandIndex, { unsigned long request; - request = DRM_IOR( DRM_COMMAND_BASE + drmCommandIndex, size); + request = DRM_IOC( DRM_IOC_READ, DRM_IOCTL_BASE, + DRM_COMMAND_BASE + drmCommandIndex, size); if (ioctl(fd, request, data)) { return -errno; @@ -1394,7 +1395,8 @@ int drmCommandWrite(int fd, unsigned long drmCommandIndex, { unsigned long request; - request = DRM_IOW( DRM_COMMAND_BASE + drmCommandIndex, size); + request = DRM_IOC( DRM_IOC_WRITE, DRM_IOCTL_BASE, + DRM_COMMAND_BASE + drmCommandIndex, size); if (ioctl(fd, request, data)) { return -errno; @@ -1407,7 +1409,8 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, { unsigned long request; - request = DRM_IOWR( DRM_COMMAND_BASE + drmCommandIndex, size); + request = DRM_IOC( DRM_IOC_READ|DRM_IOC_WRITE, DRM_IOCTL_BASE, + DRM_COMMAND_BASE + drmCommandIndex, size); if (ioctl(fd, request, data)) { return -errno; |