drm/i915: Getter/setter for object attributes

Soon we want to gut a lot of our existing assumptions how many address
spaces an object can live in, and in doing so, embed the drm_mm_node in
the object (and later the VMA).

It's possible in the future we'll want to add more getter/setter
methods, but for now this is enough to enable the VMAs.

v2: Reworked commit message (Ben)
Added comments to the main functions (Ben)
sed -i "s/i915_gem_obj_set_color/i915_gem_obj_ggtt_set_color/" drivers/gpu/drm/i915/*.[ch]
sed -i "s/i915_gem_obj_bound/i915_gem_obj_ggtt_bound/" drivers/gpu/drm/i915/*.[ch]
sed -i "s/i915_gem_obj_size/i915_gem_obj_ggtt_size/" drivers/gpu/drm/i915/*.[ch]
sed -i "s/i915_gem_obj_offset/i915_gem_obj_ggtt_offset/" drivers/gpu/drm/i915/*.[ch]
(Daniel)

v3: Rebased on new reserve_node patch
Changed DRM_DEBUG_KMS to actually work (will need fixing later)

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index afba7e5e7739..6f0a4c09e26a 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -378,7 +378,7 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,
                             enum i915_cache_level cache_level)
 {
         ppgtt->insert_entries(ppgtt, obj->pages,
-                              obj->gtt_space->start >> PAGE_SHIFT,
+                              i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT,
                               cache_level);
 }
 
@@ -386,7 +386,7 @@ void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt,
                               struct drm_i915_gem_object *obj)
 {
         ppgtt->clear_range(ppgtt,
-                           obj->gtt_space->start >> PAGE_SHIFT,
+                           i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT,
                            obj->base.size >> PAGE_SHIFT);
 }
 
@@ -551,7 +551,7 @@ void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj,
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         dev_priv->gtt.gtt_insert_entries(dev, obj->pages,
-                                         obj->gtt_space->start >> PAGE_SHIFT,
+                                         i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT,
                                          cache_level);
 
         obj->has_global_gtt_mapping = 1;
@@ -563,7 +563,7 @@ void i915_gem_gtt_unbind_object(struct drm_i915_gem_object *obj)
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         dev_priv->gtt.gtt_clear_range(obj->base.dev,
-                                      obj->gtt_space->start >> PAGE_SHIFT,
+                                      i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT,
                                       obj->base.size >> PAGE_SHIFT);
 
         obj->has_global_gtt_mapping = 0;