diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 06:12:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 03:43:34 -0400 |
commit | bb6d822ec546603bca01f7ba17c52f0f4f80e329 (patch) | |
tree | d7edf6819c03a3195dccd33e9bc242553c00f28a /drivers/gpu/drm/sis | |
parent | d4f68a7506e924e28a9153933076628002ba8bbc (diff) |
drm: move drm-lock API to drm_legacy.h
Same as the other legacy APIs, most of this is internal, so prefix it with
drm_legacy_* and move into drm_legacy.h.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/sis')
-rw-r--r-- | drivers/gpu/drm/sis/sis_mm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index 77f288e4a0a6..93ad8a5704d1 100644 --- a/drivers/gpu/drm/sis/sis_mm.c +++ b/drivers/gpu/drm/sis/sis_mm.c | |||
@@ -319,12 +319,12 @@ void sis_reclaim_buffers_locked(struct drm_device *dev, | |||
319 | if (!(file->minor->master && file->master->lock.hw_lock)) | 319 | if (!(file->minor->master && file->master->lock.hw_lock)) |
320 | return; | 320 | return; |
321 | 321 | ||
322 | drm_idlelock_take(&file->master->lock); | 322 | drm_legacy_idlelock_take(&file->master->lock); |
323 | 323 | ||
324 | mutex_lock(&dev->struct_mutex); | 324 | mutex_lock(&dev->struct_mutex); |
325 | if (list_empty(&file_priv->obj_list)) { | 325 | if (list_empty(&file_priv->obj_list)) { |
326 | mutex_unlock(&dev->struct_mutex); | 326 | mutex_unlock(&dev->struct_mutex); |
327 | drm_idlelock_release(&file->master->lock); | 327 | drm_legacy_idlelock_release(&file->master->lock); |
328 | 328 | ||
329 | return; | 329 | return; |
330 | } | 330 | } |
@@ -345,7 +345,7 @@ void sis_reclaim_buffers_locked(struct drm_device *dev, | |||
345 | } | 345 | } |
346 | mutex_unlock(&dev->struct_mutex); | 346 | mutex_unlock(&dev->struct_mutex); |
347 | 347 | ||
348 | drm_idlelock_release(&file->master->lock); | 348 | drm_legacy_idlelock_release(&file->master->lock); |
349 | 349 | ||
350 | return; | 350 | return; |
351 | } | 351 | } |