summaryrefslogtreecommitdiff
path: root/libdrm
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2007-04-18 11:55:09 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2007-04-18 11:55:09 +0100
commitef2bce3a16428feb89f447e528bdea00c1066b8b (patch)
tree7a7fcabf3a490200acd6da22c393df994bcbf9a3 /libdrm
parent51e867c57880c85c87e187af0a667e9b99413206 (diff)
parent20b2949e3738bc900407d6aeddc6338f05b0b169 (diff)
Merge remote branch 'origin/modesetting-101' into modesetting-101
Diffstat (limited to 'libdrm')
-rw-r--r--libdrm/xf86drm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index a815ed7a..2473162b 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -2814,7 +2814,7 @@ int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint,
} while (ret != 0 && errno == EAGAIN);
if (ret)
- return ret;
+ return -errno;
if (!arg.handled)
return -EFAULT;
if (rep->ret)
@@ -2870,7 +2870,7 @@ int drmBOValidate(int fd, drmBO *buf, unsigned flags, unsigned mask,
} while (ret && errno == EAGAIN);
if (ret)
- return ret;
+ return -errno;
if (!arg.handled)
return -EFAULT;
if (rep->ret)
@@ -2897,7 +2897,7 @@ int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle)
ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg);
if (ret)
- return ret;
+ return -errno;
if (!arg.handled)
return -EFAULT;
if (rep->ret)
@@ -2919,7 +2919,7 @@ int drmBOInfo(int fd, drmBO *buf)
ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg);
if (ret)
- return ret;
+ return -errno;
if (!arg.handled)
return -EFAULT;
if (rep->ret)
@@ -2947,7 +2947,7 @@ int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint)
} while (ret && errno == EAGAIN);
if (ret)
- return ret;
+ return -errno;
if (!arg.handled)
return -EFAULT;
if (rep->ret)
@@ -3199,7 +3199,7 @@ int drmMMLock(int fd, unsigned memType)
ret = ioctl(fd, DRM_IOCTL_MM_INIT, &arg);
} while (ret && errno == EAGAIN);
- return ret;
+ return -errno;
}
int drmMMUnlock(int fd, unsigned memType)
@@ -3215,7 +3215,7 @@ int drmMMUnlock(int fd, unsigned memType)
ret = ioctl(fd, DRM_IOCTL_MM_INIT, &arg);
} while (ret && errno == EAGAIN);
- return ret;
+ return -errno;
}
#define DRM_MAX_FDS 16