radeon: Use drmIoctl so we restart ioctl on EINTR or EAGAIN

This is needed as change in kernel will lead to ioctl returning
EINTR if they are interrupted.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Jerome Glisse 2009-12-07 18:30:52 +01:00
parent 9707733a13
commit b84314a86e
1 changed files with 3 additions and 4 deletions

View File

@ -37,7 +37,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h>
#include <errno.h> #include <errno.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "drm.h" #include "drm.h"
@ -86,7 +85,7 @@ static struct radeon_bo *bo_open(struct radeon_bo_manager *bom,
memset(&open_arg, 0, sizeof(open_arg)); memset(&open_arg, 0, sizeof(open_arg));
open_arg.name = handle; open_arg.name = handle;
r = ioctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg); r = drmIoctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
if (r != 0) { if (r != 0) {
free(bo); free(bo);
return NULL; return NULL;
@ -142,7 +141,7 @@ static struct radeon_bo *bo_unref(struct radeon_bo *bo)
/* close object */ /* close object */
args.handle = bo->handle; args.handle = bo->handle;
ioctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args); drmIoctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args);
memset(bo_gem, 0, sizeof(struct radeon_bo_gem)); memset(bo_gem, 0, sizeof(struct radeon_bo_gem));
free(bo_gem); free(bo_gem);
return NULL; return NULL;
@ -318,7 +317,7 @@ int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
int r; int r;
flink.handle = bo->handle; flink.handle = bo->handle;
r = ioctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink); r = drmIoctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink);
if (r) { if (r) {
return r; return r;
} }