drm/i915: Remove stored gtt_alignment

There is no need to store the gtt_alignment as it is either explicitly
set according to the hardware requirements (e.g. scanout) or the
minimum alignment is computed on demand.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

2 files changed, 3 insertions, 16 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a9c671529885..07214694b14f 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -510,10 +510,7 @@ struct drm_i915_gem_object {
          * This is the same as gtt_space->start
          */
         uint32_t gtt_offset;
-        /**
-         * Required alignment for the object
-         */
-        uint32_t gtt_alignment;
+
         /**
          * Fake offset for use by mmap(2)
          */
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 441088b37d9f..77cc6f57166c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1155,7 +1155,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         /* Now bind it into the GTT if needed */
         mutex_lock(&dev->struct_mutex);
         if (!obj_priv->gtt_space) {
-                ret = i915_gem_object_bind_to_gtt(obj, obj_priv->gtt_alignment);
+                ret = i915_gem_object_bind_to_gtt(obj, 0);
                 if (ret) {
                         mutex_unlock(&dev->struct_mutex);
                         return VM_FAULT_SIGBUS;
@@ -1398,22 +1398,12 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
 
         args->offset = obj_priv->mmap_offset;
 
-        obj_priv->gtt_alignment = i915_gem_get_gtt_alignment(obj);
-
-        /* Make sure the alignment is correct for fence regs etc */
-        if (obj_priv->agp_mem &&
-            (obj_priv->gtt_offset & (obj_priv->gtt_alignment - 1))) {
-                drm_gem_object_unreference(obj);
-                mutex_unlock(&dev->struct_mutex);
-                return -EINVAL;
-        }
-
         /*
          * Pull it into the GTT so that we have a page list (makes the
          * initial fault faster and any subsequent flushing possible).
          */
         if (!obj_priv->agp_mem) {
-                ret = i915_gem_object_bind_to_gtt(obj, obj_priv->gtt_alignment);
+                ret = i915_gem_object_bind_to_gtt(obj, 0);
                 if (ret) {
                         drm_gem_object_unreference(obj);
                         mutex_unlock(&dev->struct_mutex);