diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-04-05 19:57:00 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-04-05 19:57:00 -0500 |
| commit | ed3d1f6a105a55722a5adc99eb126312f18cabe6 (patch) | |
| tree | 6feccaf5779eb9620bdf345dc2422c00ebfa8bf5 | |
| parent | 827432d54b59712c2216e5852f99b4b786db27aa (diff) | |
OMAP4: TILER: Addinf the proper version of the tiler code.
While pulling
repository: git://dev.omapzoom.org/pub/scm/axelcx/kernel-display.git
branch: display-next
We see that drivers/media/video/tiler/tiler.c and
drivers/media/video/tiler_pack.c are overwrited for an OLD version.
This patch puts the proper version of the described files, according to:
repository: git://dev.omapzoom.org/pub/scm/dsin/tiler-omap4.git
branch: dmm_til_1.0
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
| -rw-r--r-- | drivers/media/video/tiler/tiler.c | 16 | ||||
| -rw-r--r-- | drivers/media/video/tiler/tiler_pack.c | 6 |
2 files changed, 6 insertions, 16 deletions
diff --git a/drivers/media/video/tiler/tiler.c b/drivers/media/video/tiler/tiler.c index 9f1a83363229..13841678bf5b 100644 --- a/drivers/media/video/tiler/tiler.c +++ b/drivers/media/video/tiler/tiler.c @@ -35,7 +35,6 @@ #include "tiler_def.h" #include "../dmm/dmm.h" #include "tcm/tcm.h" -#include "dmm_2d_alloc.h" struct tiler_dev { struct cdev cdev; @@ -79,11 +78,8 @@ static struct __buf_info buf_list; static struct mem_info mem_list; static struct mutex mtx; -/* required by container manager */ -static struct dmmTILERContCtxT *tilctx; - -static s32 __set_area(enum tiler_fmt fmt, u32 width, u32 height, u32 *x_area, - u32 *y_area) +static s32 __set_area(enum tiler_fmt fmt, u32 width, u32 height, u8 *x_area, + u8 *y_area) { s32 x_pagedim = 0, y_pagedim = 0; u16 tiled_pages_per_ss_page = 0; @@ -129,12 +125,12 @@ static s32 __set_area(enum tiler_fmt fmt, u32 width, u32 height, u32 *x_area, break; } - *x_area = (width + x_pagedim - 1) / x_pagedim - 1; - *y_area = (height + y_pagedim - 1) / y_pagedim - 1; + *x_area = (u8)((width + x_pagedim - 1) / x_pagedim - 1); + *y_area = (u8)((height + y_pagedim - 1) / y_pagedim - 1); tiled_pages_per_ss_page = 64; - *x_area = ((*x_area + tiled_pages_per_ss_page) & - ~(tiled_pages_per_ss_page - 1)) - 1; + *x_area = (u8)(((*x_area + tiled_pages_per_ss_page) & + ~(tiled_pages_per_ss_page - 1)) - 1); if (*x_area > TILER_WIDTH || *y_area > TILER_HEIGHT) return -1; diff --git a/drivers/media/video/tiler/tiler_pack.c b/drivers/media/video/tiler/tiler_pack.c index e2e51d6c3d52..7c3c6d95ca0f 100644 --- a/drivers/media/video/tiler/tiler_pack.c +++ b/drivers/media/video/tiler/tiler_pack.c @@ -19,12 +19,6 @@ #include "tiler.h" #include "tiler_def.h" -#define ROUND_UP_2P(a, b) (((a) + (b) - 1) & ~((b) - 1)) -#define DIVIDE_UP(a, b) (((a) + (b) - 1) / (b)) -#define ROUND_UP(a, b) (DIVIDE_UP(a, b) * (b)) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) - void tiler_alloc_packed(s32 *count, enum tiler_fmt fmt, u32 width, u32 height, void **sysptr, void **allocptr, s32 aligned) { |