From 3e27f19e98ec66966f4c1a54147521a5cc64208a Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 26 Oct 2011 00:53:57 +0200 Subject: [PATCH] --- yaml --- r: 318727 b: refs/heads/master c: 4c373790a4d4d667d1ab38b1fe2bbf6a8322e93b h: refs/heads/master i: 318725: 8b0515eea954502a12262dceb611f5d91d8ae74d 318723: 6da673376928e6e94d0f80d9981dd06b08733e72 318719: e36cabd698143e4e1cd447f4309519a38e947e14 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_lock.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9314875db2d6..65a91bfa28c7 100644 --- 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 index 521152041691..32039553e172 100644 --- 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++;