diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-09-26 15:37:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-09-30 14:13:49 +1000 |
| commit | 972f6572652bc4a2f6c44c525e5e91f2becdb62a (patch) | |
| tree | 60af3dc7e8a7c0f8bef7a3927dae161093b10dbe /libdrm/xf86drm.c | |
| parent | 89126bb58ec82511758bed36a28e698b721fb435 (diff) | |
| parent | 2db8e0c8ef8c7a66460fceda129533b364f6418c (diff) | |
Merge remote branch 'origin/master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/dri_bufmgr.h
linux-core/drm_irq.c
linux-core/drm_sysfs.c
linux-core/drm_ttm.c
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/nouveau_drv.h
shared-core/radeon_cp.c
Diffstat (limited to 'libdrm/xf86drm.c')
| -rw-r--r-- | libdrm/xf86drm.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 64765339..94f5dfad 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -178,7 +178,7 @@ static char *drmStrdup(const char *s) * Call ioctl, restarting if it is interupted */ static int -drmIoctl(int fd, int request, void *arg) +drmIoctl(int fd, unsigned long request, void *arg) { int ret; @@ -300,6 +300,7 @@ static int drmOpenDevice(long dev, int minor, int type) group = (serv_group >= 0) ? serv_group : DRM_DEV_GID; } +#if !defined(UDEV) if (stat(DRM_DIR_NAME, &st)) { if (!isroot) return DRM_ERR_NOT_ROOT; @@ -320,6 +321,30 @@ static int drmOpenDevice(long dev, int minor, int type) chown(buf, user, group); chmod(buf, devmode); } +#else + /* if we modprobed then wait for udev */ + { + int udev_count = 0; +wait_for_udev: + if (stat(DRM_DIR_NAME, &st)) { + usleep(20); + udev_count++; + + if (udev_count == 50) + return -1; + goto wait_for_udev; + } + + if (stat(buf, &st)) { + usleep(20); + udev_count++; + + if (udev_count == 50) + return -1; + goto wait_for_udev; + } + } +#endif fd = open(buf, O_RDWR, 0); drmMsg("drmOpenDevice: open result is %d, (%s)\n", |