drm/i915: Limit the display memory alignment to 32 bit instead of 64

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gem / i915_gem_domain.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
index d44a152..850776a 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
@@ -444,7 +444,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
        if (IS_ERR(vma))
                return vma;
 
-       vma->display_alignment = max_t(u64, vma->display_alignment, alignment);
+       vma->display_alignment = max(vma->display_alignment, alignment);
        i915_vma_mark_scanout(vma);
 
        i915_gem_object_flush_if_display_locked(obj);