[Mesa-dev] [PATCH 15/53] i965/drm: Use ALIGN, not ROUND_UP_TO.

[Kenneth Graunke]

ROUND_UP_TO handles a NPOT alignment, but all the alignments we use
are power of two anyway, so there's no need.
---
 src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
index 3b9272b32ba..d2bc3ed66cb 100644
--- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
+++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c
@@ -319,7 +319,7 @@ drm_bacon_gem_bo_tile_size(drm_bacon_bufmgr_gem *bufmgr_gem, unsigned long size,
 		return size;
 
 	/* 965+ just need multiples of page size for tiling */
-	return ROUND_UP_TO(size, 4096);
+	return ALIGN(size, 4096);
 }
 
 /*
@@ -345,7 +345,7 @@ drm_bacon_gem_bo_tile_pitch(drm_bacon_bufmgr_gem *bufmgr_gem,
 		tile_width = 128;
 
 	/* 965 is flexible */
-	return ROUND_UP_TO(pitch, tile_width);
+	return ALIGN(pitch, tile_width);
 }
 
 static struct drm_bacon_gem_bo_bucket *
-- 
2.12.1