diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-30 01:54:54 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-03-30 01:54:54 -0400 |
| commit | c3c2ae466cfa1d4e079f6f0396e8f0f68ecb84b8 (patch) | |
| tree | a1417fd4328176658d4baf1e54510de7e2bc06f8 /bsd-core/drm_lock.c | |
| parent | 48b5f095340e3d1b747fbececbab07e992ab344f (diff) | |
| parent | e2d7dfb61ad7a97367f050150160c205614d152e (diff) | |
Merge branch 'master' into r6xx-r7xx-support
Diffstat (limited to 'bsd-core/drm_lock.c')
| -rw-r--r-- | bsd-core/drm_lock.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c index dec7281a..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; } @@ -112,13 +112,6 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) 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(); |