diff options
| author | Dave Airlie <airlied@airlied2.(none)> | 2007-04-18 14:11:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@airlied2.(none)> | 2007-04-18 14:11:49 +1000 |
| commit | e46e028bd21552331ca4db409c2b45e54491ced6 (patch) | |
| tree | bb80819c26bbfd9d6d7bcb92a216627b2b30e095 /libdrm | |
| parent | c71c44bb9288e0bf1b319ec19a2e25f4467d9583 (diff) | |
| parent | 5a96d59ce9d9ad5816e2d0e195afa9902445f594 (diff) | |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drm_bo.c
Merge in changes from master from Thomas fixiing TTM problems
Diffstat (limited to 'libdrm')
| -rw-r--r-- | libdrm/xf86drm.c | 14 |
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 |