summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Noland <rnoland@2hip.net>2009-03-16 00:17:54 -0500
committerRobert Noland <rnoland@2hip.net>2009-03-16 00:17:54 -0500
commit6777c6bb8bb399e48500d742e80822808451010b (patch)
tree3903683676819f50f8328fbf78f05b104e06a8a9
parent06e182d0259d1d2e775814fa070c6cce0ee233a8 (diff)
FreeBSD: Don't set the PZERO flag to mtx_sleep.
We also don't support anything old enough to need tsleep.
-rw-r--r--bsd-core/drm_drv.c2
-rw-r--r--bsd-core/drm_lock.c2
-rw-r--r--shared-core/radeon_cp.c7
3 files changed, 3 insertions, 8 deletions
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 2be461da..883e3a0f 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -663,7 +663,7 @@ void drm_close(void *data)
}
/* Contention */
retcode = mtx_sleep((void *)&dev->lock.lock_queue,
- &dev->dev_lock, PZERO | PCATCH, "drmlk2", 0);
+ &dev->dev_lock, PCATCH, "drmlk2", 0);
if (retcode)
break;
}
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c
index 94b3f8bb..24c127a9 100644
--- a/bsd-core/drm_lock.c
+++ b/bsd-core/drm_lock.c
@@ -79,7 +79,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
/* Contention */
ret = mtx_sleep((void *)&dev->lock.lock_queue, &dev->dev_lock,
- PZERO | PCATCH, "drmlk2", 0);
+ PCATCH, "drmlk2", 0);
if (ret != 0)
break;
}
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 872f5891..6771d4f5 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -1406,12 +1406,7 @@ void radeon_do_release(struct drm_device * dev)
#ifdef __linux__
schedule();
#else
-#if defined(__FreeBSD__) && __FreeBSD_version > 500000
- mtx_sleep(&ret, &dev->dev_lock, PZERO, "rdnrel",
- 1);
-#else
- tsleep(&ret, PZERO, "rdnrel", 1);
-#endif
+ mtx_sleep(&ret, &dev->dev_lock, 0, "rdnrel", 1);
#endif
}
radeon_do_cp_stop(dev_priv);