diff options
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/tiler.h | 13 | ||||
| -rw-r--r-- | drivers/media/video/tiler/tiler.h | 13 | ||||
| -rw-r--r-- | drivers/media/video/tiler/tiler_pack.c | 26 |
3 files changed, 26 insertions, 26 deletions
diff --git a/arch/arm/mach-omap2/include/mach/tiler.h b/arch/arm/mach-omap2/include/mach/tiler.h index e3ae1c14a10..b8adf1439b6 100644 --- a/arch/arm/mach-omap2/include/mach/tiler.h +++ b/arch/arm/mach-omap2/include/mach/tiler.h @@ -94,18 +94,23 @@ s32 tiler_alloc(enum tiler_fmt fmt, u32 width, u32 height, u32 *sys_addr); */ s32 tiler_free(u32 sys_addr); +u32 tiler_reorient_addr(u32 tsptr, struct tiler_view_orient orient); + u32 tiler_get_natural_addr(void *sys_ptr); -void tiler_rotate_view(struct tiler_view_orient *orient, u32 rotation); +u32 tiler_reorient_topleft(u32 tsptr, struct tiler_view_orient orient, + u32 width, u32 height); u32 tiler_stride(u32 tsptr); -void tiler_alloc_packed_nv12(s32 *count, u32 width, u32 height, void **y_sysptr, - void **uv_sysptr, void **y_allocptr, - void **uv_allocptr, s32 aligned); +void tiler_rotate_view(struct tiler_view_orient *orient, u32 rotation); void tiler_alloc_packed(s32 *count, enum tiler_fmt fmt, u32 width, u32 height, void **sysptr, void **allocptr, s32 aligned); +void tiler_alloc_packed_nv12(s32 *count, u32 width, u32 height, void **y_sysptr, + void **uv_sysptr, void **y_allocptr, + void **uv_allocptr, s32 aligned); + #endif diff --git a/drivers/media/video/tiler/tiler.h b/drivers/media/video/tiler/tiler.h index e3ae1c14a10..b8adf1439b6 100644 --- a/drivers/media/video/tiler/tiler.h +++ b/drivers/media/video/tiler/tiler.h @@ -94,18 +94,23 @@ s32 tiler_alloc(enum tiler_fmt fmt, u32 width, u32 height, u32 *sys_addr); */ s32 tiler_free(u32 sys_addr); +u32 tiler_reorient_addr(u32 tsptr, struct tiler_view_orient orient); + u32 tiler_get_natural_addr(void *sys_ptr); -void tiler_rotate_view(struct tiler_view_orient *orient, u32 rotation); +u32 tiler_reorient_topleft(u32 tsptr, struct tiler_view_orient orient, + u32 width, u32 height); u32 tiler_stride(u32 tsptr); -void tiler_alloc_packed_nv12(s32 *count, u32 width, u32 height, void **y_sysptr, - void **uv_sysptr, void **y_allocptr, - void **uv_allocptr, s32 aligned); +void tiler_rotate_view(struct tiler_view_orient *orient, u32 rotation); void tiler_alloc_packed(s32 *count, enum tiler_fmt fmt, u32 width, u32 height, void **sysptr, void **allocptr, s32 aligned); +void tiler_alloc_packed_nv12(s32 *count, u32 width, u32 height, void **y_sysptr, + void **uv_sysptr, void **y_allocptr, + void **uv_allocptr, s32 aligned); + #endif diff --git a/drivers/media/video/tiler/tiler_pack.c b/drivers/media/video/tiler/tiler_pack.c index 412cdede73f..e7727bf7be1 100644 --- a/drivers/media/video/tiler/tiler_pack.c +++ b/drivers/media/video/tiler/tiler_pack.c @@ -19,13 +19,8 @@ #include "tiler.h" #include "tiler_def.h" -void tiler_packed_alloc_buf(int *count, - enum tiler_fmt fmt, - unsigned long width, - unsigned long height, - void **sysptr, - void **allocptr, - int aligned) +void tiler_alloc_packed(s32 *count, enum tiler_fmt fmt, u32 width, u32 height, + void **sysptr, void **allocptr, s32 aligned) { int til_width, bpp, bpt, buf_width, alloc_width, map_width; int buf_map_width, n_per_m, m_per_a, i = 0, m, n; @@ -74,7 +69,7 @@ void tiler_packed_alloc_buf(int *count, buf_width * (n_alloc - (m_alloc - 1) * m_per_a)); res = tiler_alloc(fmt, til_width * tiles, height, - (u32 *)*sysptr + i); + (u32 *)sysptr + i); if (res != 0) break; @@ -103,7 +98,7 @@ void tiler_packed_alloc_buf(int *count, /* mark how many buffers we allocated */ *count = i; } -EXPORT_SYMBOL(tiler_packed_alloc_buf); +EXPORT_SYMBOL(tiler_alloc_packed); static int layout_packed_nv12(char *offsets, int y_width, int uv_width, void **buf, int blocks, int i, @@ -132,14 +127,9 @@ static int layout_packed_nv12(char *offsets, int y_width, int uv_width, return i; } -void tiler_packed_alloc_nv12_buf(int *count, - unsigned long width, - unsigned long height, - void **y_sysptr, - void **uv_sysptr, - void **y_allocptr, - void **uv_allocptr, - int aligned) +void tiler_alloc_packed_nv12(s32 *count, u32 width, u32 height, void **y_sysptr, + void **uv_sysptr, void **y_allocptr, + void **uv_allocptr, s32 aligned) { /* optimized packing table */ /* we read this table from beginning to end, and determine whether @@ -275,4 +265,4 @@ void tiler_packed_alloc_nv12_buf(int *count, /* mark how many buffers we allocated */ *count = i; } -EXPORT_SYMBOL(tiler_packed_alloc_nv12_buf); +EXPORT_SYMBOL(tiler_alloc_packed_nv12); |