TILER: Simplify alignment and offset usage in driver

Slim down APIs by removing alignment and offset.  Simplified
calculations based off of align/offset.

Change-Id: I7d7bdb89668a7f553bbbd836f5dc45f6beceab25
Signed-off-by: Andy Gross <andy.gross@ti.com>

1 files changed, 7 insertions, 24 deletions

diff --git a/arch/arm/mach-omap2/include/mach/tiler.h b/arch/arm/mach-omap2/include/mach/tiler.h
index bbb4108..6e25dcc 100644
--- a/arch/arm/mach-omap2/include/mach/tiler.h
+++ b/arch/arm/mach-omap2/include/mach/tiler.h
@@ -139,13 +139,10 @@ u32 tiler_virt2phys(u32 usr);
  *		must be 0) with the tiler block information. 'height' must be 1
  *		for 1D block.
  * @param fmt	TILER block format
- * @param align	block alignment (default: normally PAGE_SIZE)
- * @param offs	block offset
  *
  * @return error status
  */
-s32 tiler_alloc(struct tiler_block_t *blk, enum tiler_fmt fmt, u32 align,
-		u32 offs);
+s32 tiler_alloc(struct tiler_block_t *blk, enum tiler_fmt fmt);
 
 /**
  * Reserves a 1D or 2D TILER block area and memory for a set process and group
@@ -155,15 +152,13 @@ s32 tiler_alloc(struct tiler_block_t *blk, enum tiler_fmt fmt, u32 align,
  *		must be 0) with the tiler block information. 'height' must be 1
  *		for 1D block.
  * @param fmt	TILER block format
- * @param align	block alignment (default: normally PAGE_SIZE)
- * @param offs	block offset
  * @param gid	group ID
  * @param pid	process ID
  *
  * @return error status
  */
-s32 tiler_allocx(struct tiler_block_t *blk, enum tiler_fmt fmt, u32 align,
-					u32 offs, u32 gid, pid_t pid);
+s32 tiler_allocx(struct tiler_block_t *blk, enum tiler_fmt fmt,
+					u32 gid, pid_t pid);
 
 /**
  * Mmaps a portion of a tiler block to a virtual address.  Use this method in
@@ -259,11 +254,8 @@ void tiler_free(struct tiler_block_t *blk);
  * @param fmt		TILER format
  * @param width		block width
  * @param height	block height (must be 1 for 1D)
- * @param align		block alignment (default: PAGE_SIZE)
- * @param offs		block offset
  */
-void tiler_reserve(u32 n, enum tiler_fmt fmt, u32 width, u32 height, u32 align,
-								u32 offs);
+void tiler_reserve(u32 n, enum tiler_fmt fmt, u32 width, u32 height);
 
 /**
  * Reserves tiler area for n identical blocks.  Use this method to get optimal
@@ -274,13 +266,11 @@ void tiler_reserve(u32 n, enum tiler_fmt fmt, u32 width, u32 height, u32 align,
  * @param fmt		TILER bit mode
  * @param width		block width
  * @param height	block height (must be 1 for 1D)
- * @param align		block alignment (default: PAGE_SIZE)
- * @param offs		block offset
  * @param gid		group ID
  * @param pid		process ID
  */
 void tiler_reservex(u32 n, enum tiler_fmt fmt, u32 width, u32 height,
-				u32 align, u32 offs, u32 gid, pid_t pid);
+				u32 gid, pid_t pid);
 
 /**
  * Reserves tiler area for n identical NV12 blocks for the current process.  Use
@@ -290,10 +280,8 @@ void tiler_reservex(u32 n, enum tiler_fmt fmt, u32 width, u32 height,
  * @param n		number of identical set of blocks
  * @param width		block width (Y)
  * @param height	block height (Y)
- * @param align		block alignment (default: PAGE_SIZE)
- * @param offs		block offset
  */
-void tiler_reserve_nv12(u32 n, u32 width, u32 height, u32 align, u32 offs);
+void tiler_reserve_nv12(u32 n, u32 width, u32 height);
 
 /**
  * Reserves tiler area for n identical NV12 blocks.  Use this method to get
@@ -303,13 +291,10 @@ void tiler_reserve_nv12(u32 n, u32 width, u32 height, u32 align, u32 offs);
  * @param n		number of identical set of blocks
  * @param width		block width (Y)
  * @param height	block height (Y)
- * @param align		block alignment (default: PAGE_SIZE)
- * @param offs		block offset
  * @param gid		group ID
  * @param pid		process ID
  */
-void tiler_reservex_nv12(u32 n, u32 width, u32 height, u32 align, u32 offs,
-							u32 gid, pid_t pid);
+void tiler_reservex_nv12(u32 n, u32 width, u32 height, u32 gid, pid_t pid);
 
 /**
  * Create a view based on a tiler address and width and height
@@ -431,8 +416,6 @@ struct tiler_block_info {
 	u32 id;
 	u32 key;
 	u32 group_id;
-	u32 align;	/* alignment requirements for ssptr */
-	u32 offs;	/* offset (ssptr & (align - 1) will equal offs) */
 	u32 ssptr;	/* physical address, may not exposed by default */
 };