---

yaml --- r: 318727 b: refs/heads/master c: 4c37379 h: refs/heads/master i: 318725: 8b0515e 318723: 6da6733 318719: e36cabd v: v3
git-mirror · Jul 20, 2012 · 3e27f19 · 3e27f19
1 parent 248feac
commit 3e27f19
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0071efe827f68cf173e1a8868b70618e9aca7d7
+refs/heads/master: 4c373790a4d4d667d1ab38b1fe2bbf6a8322e93b
diff --git a/trunk/drivers/gpu/drm/drm_lock.c b/trunk/drivers/gpu/drm/drm_lock.c
@@ -70,10 +70,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 		  lock->context, task_pid_nr(current),
 		  master->lock.hw_lock->lock, lock->flags);
 
-	if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE))
-		if (lock->context < 0)
-			return -EINVAL;
-
 	add_wait_queue(&master->lock.lock_queue, &entry);
 	spin_lock_bh(&master->lock.spinlock);
 	master->lock.user_waiters++;