1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index dd4a316c3d74..2c231070d250 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -74,7 +74,7 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file
         dev_priv->vram_offset = fb->offset;
 
         mutex_unlock(&dev->struct_mutex);
-        DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
+        DRM_DEBUG("offset = %lu, size = %lu\n", fb->offset, fb->size);
 
         return 0;
 }
@@ -161,7 +161,7 @@ fail_alloc:
         mem->size = 0;
         mem->free = 0;
 
-        DRM_DEBUG("alloc %d, size = %d, offset = %d\n", pool, mem->size,
+        DRM_DEBUG("alloc %d, size = %ld, offset = %ld\n", pool, mem->size,
                   mem->offset);
 
         return retval;
@@ -215,7 +215,7 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,
         dev_priv->agp_offset = agp->offset;
         mutex_unlock(&dev->struct_mutex);
 
-        DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
+        DRM_DEBUG("offset = %lu, size = %lu\n", agp->offset, agp->size);
         return 0;
 }
 
@@ -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;
 }