---

yaml --- r: 318722 b: refs/heads/master c: 3ae6b64 h: refs/heads/master v: v3
git-mirror · Jul 20, 2012 · d9abaf4 · d9abaf4
1 parent 6e988b9
commit d9abaf4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea5e437406701838751ebc0f797d8b1c31df8121
+refs/heads/master: 3ae6b64400cc92530bcab73d13c6e1b7a5cfd915
diff --git a/trunk/drivers/gpu/drm/drm_fops.c b/trunk/drivers/gpu/drm/drm_fops.c
@@ -417,14 +417,6 @@ static void drm_master_release(struct drm_device *dev, struct file *filp)
 	    file_priv->master->lock.hw_lock)
 		drm_reclaim_locked_buffers(dev, filp);
 
-	if (dev->driver->reclaim_buffers_idlelocked &&
-	    file_priv->master->lock.hw_lock) {
-		drm_idlelock_take(&file_priv->master->lock);
-		dev->driver->reclaim_buffers_idlelocked(dev, file_priv);
-		drm_idlelock_release(&file_priv->master->lock);
-	}
-
-
 	if (drm_i_have_hw_lock(dev, file_priv)) {
 		DRM_DEBUG("File %p released, freeing lock for context %d\n",
 			  filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));

diff --git a/trunk/include/drm/drmP.h b/trunk/include/drm/drmP.h
@@ -880,8 +880,6 @@ struct drm_driver {
 				 struct drm_file * file_priv);
 	void (*reclaim_buffers_locked) (struct drm_device *dev,
 					struct drm_file *file_priv);
-	void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
-					    struct drm_file *file_priv);
 	void (*set_version) (struct drm_device *dev,
 			     struct drm_set_version *sv);