diff options
| author | rnoland <rnoland@FreeBSD.org> | 2008-10-23 20:19:56 +0000 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2008-10-23 20:19:56 +0000 |
| commit | a92db6b830618fa87ea11a154afd498e52b7a2ef (patch) | |
| tree | 5b635e5afed3b8eeeef5d8e5e10cfd4e4c9ffcd4 /sys | |
| parent | 58aba2ce39cbcc155d4f13233ccf07d4c49b729f (diff) | |
| download | FreeBSD-src-a92db6b830618fa87ea11a154afd498e52b7a2ef.zip FreeBSD-src-a92db6b830618fa87ea11a154afd498e52b7a2ef.tar.gz | |
This check is invalid and I disabled it once already. I accidentally
reintroduced it with the sync to git master. Commit the fix in both
places this time.
Approved by: jhb (mentor)
MFC after: 2 weeks
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/drm/drm_lock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/drm/drm_lock.c b/sys/dev/drm/drm_lock.c index 668bce8..2da7a75 100644 --- a/sys/dev/drm/drm_lock.c +++ b/sys/dev/drm/drm_lock.c @@ -105,17 +105,15 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_lock *lock = data; + DRM_DEBUG("%d (pid %d) requests unlock (0x%08x), flags = 0x%08x\n", + lock->context, DRM_CURRENTPID, dev->lock.hw_lock->lock, + lock->flags); + if (lock->context == DRM_KERNEL_CONTEXT) { DRM_ERROR("Process %d using kernel context %d\n", DRM_CURRENTPID, lock->context); return EINVAL; } - /* Check that the context unlock being requested actually matches - * who currently holds the lock. - */ - if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) || - _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) != lock->context) - return EINVAL; DRM_SPINLOCK(&dev->tsk_lock); if (dev->locked_task_call != NULL) { |
