diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-12-09 14:50:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-12-09 14:51:00 +1000 |
| commit | edc77dd291594e017ca0ee96a785412107ebff74 (patch) | |
| tree | cfe012b28fb072b106f217dfa07792c18c47d95a /nouveau | |
| parent | 7c82527b4fd4ec1642be20d8bba2d10f045c87ef (diff) | |
| download | libdrm-edc77dd291594e017ca0ee96a785412107ebff74.tar.gz libdrm-edc77dd291594e017ca0ee96a785412107ebff74.tar.bz2 libdrm-edc77dd291594e017ca0ee96a785412107ebff74.zip | |
nouveau: Use drmIoctl so we restart ioctl on EINTR or EAGAIN
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nouveau')
| -rw-r--r-- | nouveau/nouveau_bo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nouveau/nouveau_bo.c b/nouveau/nouveau_bo.c index 85fc14f6..ae11b689 100644 --- a/nouveau/nouveau_bo.c +++ b/nouveau/nouveau_bo.c @@ -29,7 +29,6 @@ #include <assert.h> #include <sys/mman.h> -#include <sys/ioctl.h> #include "nouveau_private.h" @@ -106,7 +105,7 @@ nouveau_bo_kfree(struct nouveau_bo_priv *nvbo) req.handle = nvbo->handle; nvbo->handle = 0; - ioctl(nvdev->fd, DRM_IOCTL_GEM_CLOSE, &req); + drmIoctl(nvdev->fd, DRM_IOCTL_GEM_CLOSE, &req); } static int @@ -290,7 +289,7 @@ nouveau_bo_handle_get(struct nouveau_bo *bo, uint32_t *handle) return ret; req.handle = nvbo->handle; - ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req); + ret = drmIoctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req); if (ret) { nouveau_bo_kfree(nvbo); return ret; @@ -313,7 +312,7 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle, int ret; req.name = handle; - ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_OPEN, &req); + ret = drmIoctl(nvdev->fd, DRM_IOCTL_GEM_OPEN, &req); if (ret) { nouveau_bo_ref(NULL, bo); return ret; |