From: Rob Clark <robdcl...@chromium.org>

Just code-motion.

Signed-off-by: Rob Clark <robdcl...@chromium.org>
---
 drivers/gpu/drm/msm/msm_gem.c | 46 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 009a34b3a49b..c97dddf3e2f2 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -19,8 +19,6 @@
 #include "msm_gpu.h"
 #include "msm_mmu.h"
 
-static void update_lru(struct drm_gem_object *obj);
-
 static dma_addr_t physaddr(struct drm_gem_object *obj)
 {
        struct msm_gem_object *msm_obj = to_msm_bo(obj);
@@ -63,6 +61,28 @@ static void sync_for_cpu(struct msm_gem_object *msm_obj)
        dma_unmap_sgtable(dev, msm_obj->sgt, DMA_BIDIRECTIONAL, 0);
 }
 
+static void update_lru(struct drm_gem_object *obj)
+{
+       struct msm_drm_private *priv = obj->dev->dev_private;
+       struct msm_gem_object *msm_obj = to_msm_bo(obj);
+
+       msm_gem_assert_locked(&msm_obj->base);
+
+       if (!msm_obj->pages) {
+               GEM_WARN_ON(msm_obj->pin_count);
+
+               drm_gem_lru_move_tail(&priv->lru.unbacked, obj);
+       } else if (msm_obj->pin_count) {
+               drm_gem_lru_move_tail(&priv->lru.pinned, obj);
+       } else if (msm_obj->madv == MSM_MADV_WILLNEED) {
+               drm_gem_lru_move_tail(&priv->lru.willneed, obj);
+       } else {
+               GEM_WARN_ON(msm_obj->madv != MSM_MADV_DONTNEED);
+
+               drm_gem_lru_move_tail(&priv->lru.dontneed, obj);
+       }
+}
+
 /* allocate pages from VRAM carveout, used when no IOMMU: */
 static struct page **get_pages_vram(struct drm_gem_object *obj, int npages)
 {
@@ -804,28 +824,6 @@ void msm_gem_vunmap(struct drm_gem_object *obj)
        msm_obj->vaddr = NULL;
 }
 
-static void update_lru(struct drm_gem_object *obj)
-{
-       struct msm_drm_private *priv = obj->dev->dev_private;
-       struct msm_gem_object *msm_obj = to_msm_bo(obj);
-
-       msm_gem_assert_locked(&msm_obj->base);
-
-       if (!msm_obj->pages) {
-               GEM_WARN_ON(msm_obj->pin_count);
-
-               drm_gem_lru_move_tail(&priv->lru.unbacked, obj);
-       } else if (msm_obj->pin_count) {
-               drm_gem_lru_move_tail(&priv->lru.pinned, obj);
-       } else if (msm_obj->madv == MSM_MADV_WILLNEED) {
-               drm_gem_lru_move_tail(&priv->lru.willneed, obj);
-       } else {
-               GEM_WARN_ON(msm_obj->madv != MSM_MADV_DONTNEED);
-
-               drm_gem_lru_move_tail(&priv->lru.dontneed, obj);
-       }
-}
-
 bool msm_gem_active(struct drm_gem_object *obj)
 {
        msm_gem_assert_locked(obj);
-- 
2.39.2

Reply via email to