Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / via / via_mm.c

diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index d70b1e1544bf68f7d99c1c756d00080f435e0815..4f20742e7788c4fe0626782c18b888795d5179c8 100644 (file)
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -211,12 +211,12 @@ void via_reclaim_buffers_locked(struct drm_device *dev,
        if (!(file->minor->master && file->master->lock.hw_lock))
                return;
 
-       drm_idlelock_take(&file->master->lock);
+       drm_legacy_idlelock_take(&file->master->lock);
 
        mutex_lock(&dev->struct_mutex);
        if (list_empty(&file_priv->obj_list)) {
                mutex_unlock(&dev->struct_mutex);
-               drm_idlelock_release(&file->master->lock);
+               drm_legacy_idlelock_release(&file->master->lock);
 
                return;
        }
@@ -231,7 +231,7 @@ void via_reclaim_buffers_locked(struct drm_device *dev,
        }
        mutex_unlock(&dev->struct_mutex);
 
-       drm_idlelock_release(&file->master->lock);
+       drm_legacy_idlelock_release(&file->master->lock);
 
        return;
 }