diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-05-08 11:22:39 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-05-08 11:22:39 -0500 |
| commit | b9549092d3791fffcadee15d592ebbde8e12dbd5 (patch) | |
| tree | 35691db8bbe5b556696500d792b27f622d8b0e62 | |
| parent | e3071993b799f94156e343c9ba39df137c6203e7 (diff) | |
| parent | 4e0298d81c8f19fac07aaf12f9987ba11ca5a2c8 (diff) | |
Merge branch 'dmm_til_1.0' of git://dev.omapzoom.org/pub/scm/dsin/tiler-omap4 into L24x6
Conflicts:
arch/arm/configs/omap_4430sdp_defconfig
drivers/Kconfig
drivers/Makefile
drivers/media/video/tiler/tiler_pack.c
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
| -rw-r--r-- | drivers/media/video/tiler/tiler_pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tiler/tiler_pack.c b/drivers/media/video/tiler/tiler_pack.c index 7c3c6d95ca0f..0b7ff9200b41 100644 --- a/drivers/media/video/tiler/tiler_pack.c +++ b/drivers/media/video/tiler/tiler_pack.c @@ -66,7 +66,7 @@ void tiler_alloc_packed(s32 *count, enum tiler_fmt fmt, u32 width, u32 height, n_alloc = MIN(*count - i, m_per_a * n_per_m); m_alloc = DIVIDE_UP(n_alloc, n_per_m); tiles = ((m_alloc - 1) * map_width + - buf_width * (n_alloc - (m_alloc - 1) * m_per_a)); + buf_width * (n_alloc - (m_alloc - 1) * n_per_m)); res = tiler_alloc(fmt, til_width * tiles, height, (u32 *)sysptr + i); |