diff options
| author | Owain Gordon Ainsworth <oga@openbsd.org> | 2008-07-07 17:23:48 +0100 |
|---|---|---|
| committer | Robert Noland <rnoland@2hip.net> | 2008-07-16 21:37:39 -0400 |
| commit | 74cf1f91be7f4139601624af0343e3d411190dec (patch) | |
| tree | 05b856fe8ee275c8c153f89c5a85ef56d7ea580e /bsd-core/drm_lock.c | |
| parent | 96580f660e5509dcf6c34de5630e3d36b156bcd5 (diff) | |
BSD: change drm_locked_task*() to use the same scheme as linux.
The current code can sleep in an interrupt handler, that is bad. So
instead if we can't grab the lock, flag it and run the tasklet on
unlock.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Diffstat (limited to 'bsd-core/drm_lock.c')
| -rw-r--r-- | bsd-core/drm_lock.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c index 9101dec8..80ebb71d 100644 --- a/bsd-core/drm_lock.c +++ b/bsd-core/drm_lock.c @@ -180,6 +180,13 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) != lock->context) return EINVAL; + DRM_SPINLOCK(&dev->tsk_lock); + if (dev->locked_task_call != NULL) { + dev->locked_task_call(dev); + dev->locked_task_call = NULL; + } + DRM_SPINUNLOCK(&dev->tsk_lock); + atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); DRM_LOCK(); |