drm/sis: clean up reclaim_buffers

Like for via.

v2: Actually drop the idlelock again if taken.

v3: Fixup.

v4: Fixup the "has master" vs. "is master" confusion the refactor
introduced.

v5: Drop the idlelock in the early return path.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index dd4a316c3d74..5acc396ef93c 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -321,14 +321,20 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
         struct sis_file_private *file_priv = file->driver_priv;
         struct sis_memblock *entry, *next;
 
+        if (!(file->minor->master && file->master->lock.hw_lock))
+                return;
+
+        drm_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);
+
                 return;
         }
 
-        if (dev->driver->dma_quiescent)
-                dev->driver->dma_quiescent(dev);
+        sis_idle(dev);
 
 
         list_for_each_entry_safe(entry, next, &file_priv->obj_list,
@@ -343,6 +349,9 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
                 kfree(entry);
         }
         mutex_unlock(&dev->struct_mutex);
+
+        drm_idlelock_release(&file->master->lock);
+
         return;
 }