nouveau: rename

diff --git a/linux-core/nouveau_buffer.c b/linux-core/nouveau_buffer.c
index 0dd4a53..9b252a0 100644 (file)
--- a/linux-core/nouveau_buffer.c
+++ b/linux-core/nouveau_buffer.c
@@ -149,7 +149,7 @@ nouveau_bo_evict_mask(struct drm_buffer_object *bo)
  */
 static int
 nouveau_bo_move_m2mf(struct drm_buffer_object *bo, int evict, int no_wait,
-               struct drm_bo_mem_reg *new_mem)
+                    struct drm_bo_mem_reg *new_mem)
 {
        struct drm_device *dev = bo->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -198,8 +198,8 @@ nouveau_bo_move_m2mf(struct drm_buffer_object *bo, int evict, int no_wait,
 
 /* Flip pages into the GART and move if we can. */
 static int
-nouveau_bo_flip(struct drm_buffer_object *bo, int evict, int no_wait,
-               struct drm_bo_mem_reg *new_mem)
+nouveau_bo_move_gart(struct drm_buffer_object *bo, int evict, int no_wait,
+                     struct drm_bo_mem_reg *new_mem)
 {
         struct drm_device *dev = bo->dev;
         struct drm_bo_mem_reg tmp_mem;
@@ -246,14 +246,14 @@ nouveau_bo_move(struct drm_buffer_object *bo, int evict, int no_wait,
                if (old_mem->mem_type == DRM_BO_MEM_LOCAL)
                        return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
 #if 0
-               if (!nouveau_bo_move_flipd(bo, evict, no_wait, new_mem))
+               if (!nouveau_bo_move_to_gart(bo, evict, no_wait, new_mem))
 #endif
                        return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
        }
        else
        if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
 #if 0
-               if (nouveau_bo_move_flips(bo, evict, no_wait, new_mem))
+               if (nouveau_bo_move_to_gart(bo, evict, no_wait, new_mem))
 #endif
                        return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
        }