[PATCH 07/16] HAX: force alignment for 48b ppgtt

[Matthew Auld]

We don't force any alignment/padding for objects which need to to packed
into the lower 32bits, however for testing purposes remove this
restriction for now.

Signed-off-by: Matthew Auld <matthew.auld at intel.com>
---
 drivers/gpu/drm/i915/i915_vma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index ffafec3e4573..e466debb80bc 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -492,7 +492,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
 		 * however we also don't want to force any alignment for
 		 * objects which need to be tightly packed into the low 32bits.
 		 */
-		if (end > (1ULL << 32) &&
+		if (i915_vm_is_48bit(vma->vm) &&
 		    vma->page_sizes.sg > I915_GTT_PAGE_SIZE) {
 			u64 page_alignment =
 				rounddown_pow_of_two(vma->page_sizes.sg |
-- 
2.9.4