drm/i915: Move vma vfuns to adddress_space

They change with the address space and not with each vma, so move them
into the right pile of vfuncs. Save 2 pointers per vma and clarifies
the code.

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 29de64d1164e..12d0ded0d823 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -196,14 +196,6 @@ struct i915_vma {
          * bits with absolutely no headroom. So use 4 bits. */
         unsigned int pin_count:4;
 #define DRM_I915_GEM_OBJECT_MAX_PIN_COUNT 0xf
-
-        /** Unmap an object from an address space. This usually consists of
-         * setting the valid PTE entries to a reserved scratch page. */
-        void (*unbind_vma)(struct i915_vma *vma);
-        /* Map an object into an address space with the given cache flags. */
-        void (*bind_vma)(struct i915_vma *vma,
-                         enum i915_cache_level cache_level,
-                         u32 flags);
 };
 
 struct i915_page_table {
@@ -281,6 +273,13 @@ struct i915_address_space {
                                uint64_t start,
                                enum i915_cache_level cache_level, u32 flags);
         void (*cleanup)(struct i915_address_space *vm);
+        /** Unmap an object from an address space. This usually consists of
+         * setting the valid PTE entries to a reserved scratch page. */
+        void (*unbind_vma)(struct i915_vma *vma);
+        /* Map an object into an address space with the given cache flags. */
+        void (*bind_vma)(struct i915_vma *vma,
+                         enum i915_cache_level cache_level,
+                         u32 flags);
 };
 
 /* The Graphics Translation Table is the way in which GEN hardware translates a