summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fbc3072)
raw | patch | inline | side by side (parent: fbc3072)
author | Robert Noland <rnoland@2hip.net> | |
Sun, 2 Dec 2007 06:45:09 +0000 (01:45 -0500) | ||
committer | Robert Noland <rnoland@2hip.net> | |
Sun, 2 Dec 2007 06:45:09 +0000 (01:45 -0500) |
bsd-core/drmP.h | patch | blob | history | |
bsd-core/drm_irq.c | patch | blob | history | |
bsd-core/drm_lock.c | patch | blob | history | |
shared-core/radeon_cp.c | patch | blob | history |
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 56605d1f07ed8151c8ab079376e186f38f62ed4b..99457bf8631a3713368ca86b31ac7de099752418 100644 (file)
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
DRM_UNLOCK(); \
mtx_lock(&dev->irq_lock); \
if (!(condition)) \
- ret = -msleep(&(queue), &dev->irq_lock, \
+ ret = -mtx_sleep(&(queue), &dev->irq_lock, \
PZERO | PCATCH, "drmwtq", (timeout)); \
mtx_unlock(&dev->irq_lock); \
DRM_LOCK(); \
diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c
index 6a85287338f778113d66d96382efa510711b8e2c..40d0b71f8c9177b019348a879a2d3e060afdf67e 100644 (file)
--- a/bsd-core/drm_irq.c
+++ b/bsd-core/drm_irq.c
/* Contention */
#if defined(__FreeBSD__) && __FreeBSD_version > 500000
- ret = msleep((void *)&dev->lock.lock_queue, &dev->dev_lock,
+ ret = mtx_sleep((void *)&dev->lock.lock_queue, &dev->dev_lock,
PZERO | PCATCH, "drmlk2", 0);
#else
ret = tsleep((void *)&dev->lock.lock_queue, PZERO | PCATCH,
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c
index fb86fc68e95ed3e9ea07d72abce4c0b8c4457342..9731ff9217c8cfc4ef492c42094e02a5c07aa234 100644 (file)
--- a/bsd-core/drm_lock.c
+++ b/bsd-core/drm_lock.c
/* Contention */
#if defined(__FreeBSD__) && __FreeBSD_version > 500000
- ret = msleep((void *)&dev->lock.lock_queue, &dev->dev_lock,
+ ret = mtx_sleep((void *)&dev->lock.lock_queue, &dev->dev_lock,
PZERO | PCATCH, "drmlk2", 0);
#else
ret = tsleep((void *)&dev->lock.lock_queue, PZERO | PCATCH,
index 8f95a077589cabd6e172aab09710771c2af94907..fc1fe07a16c640c73526899097924819bc3e35ce 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
schedule();
#else
#if defined(__FreeBSD__) && __FreeBSD_version > 500000
- msleep(&ret, &dev->dev_lock, PZERO, "rdnrel",
+ mtx_sleep(&ret, &dev->dev_lock, PZERO, "rdnrel",
1);
#else
tsleep(&ret, PZERO, "rdnrel", 1);