fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-01-04 15:40:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the call to drm_lock_transfer, since it is not used anymore.

Browse source 
Fix up drm_lock_free to retain the last locking context information.
This commit is contained in:
Thomas Hellstrom 2006-09-26 14:40:11 +02:00
parent 711f077b74
commit 26528627a6
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
linux-core/drm_lock.c
View file

@ -170,11 +170,8 @@ int drm_unlock(struct inode *inode, struct file *filp,
if (dev->driver->kernel_context_switch_unlock)
dev->driver->kernel_context_switch_unlock(dev);
else {
drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
DRM_KERNEL_CONTEXT);
if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
DRM_KERNEL_CONTEXT)) {
lock.context)) {
DRM_ERROR("\n");
}
}
@ -263,12 +260,12 @@ int drm_lock_free(drm_device_t * dev,
{
unsigned int old, new, prev;
dev->lock.filp = NULL;
do {
old = *lock;
new = 0;
new = _DRM_LOCKING_CONTEXT(old);
prev = cmpxchg(lock, old, new);
} while (prev != old);
if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
DRM_DEBUG("%d freed heavyweight lock held by %d\n",
context, _DRM_LOCKING_CONTEXT(old));