1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index d5c14af51e99..beaf4bcfdac8 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -123,6 +123,12 @@ struct i915_vma {
         struct drm_i915_gem_object *obj;
         struct i915_address_space *vm;
 
+        /** Flags and address space this VMA is bound to */
+#define GLOBAL_BIND     (1<<0)
+#define LOCAL_BIND      (1<<1)
+#define PTE_READ_ONLY   (1<<2)
+        unsigned int bound : 4;
+
         /** This object's place on the active/inactive lists */
         struct list_head mm_list;
 
@@ -155,8 +161,6 @@ struct i915_vma {
          * 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. */
-#define GLOBAL_BIND (1<<0)
-#define PTE_READ_ONLY (1<<1)
         void (*bind_vma)(struct i915_vma *vma,
                          enum i915_cache_level cache_level,
                          u32 flags);
@@ -270,8 +274,6 @@ struct i915_hw_ppgtt {
 
 int i915_gem_gtt_init(struct drm_device *dev);
 void i915_gem_init_global_gtt(struct drm_device *dev);
-int i915_gem_setup_global_gtt(struct drm_device *dev, unsigned long start,
-                              unsigned long mappable_end, unsigned long end);
 void i915_global_gtt_cleanup(struct drm_device *dev);