summaryrefslogtreecommitdiff
path: root/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
diff options
context:
space:
mode:
authorArun Kumar K <arun.kk@samsung.com>2013-07-09 08:24:35 +0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-18 14:07:44 +0400
commit3dc7cc24db5986ed5c94c79201f35e3d4610384c (patch)
treedca9acf23e004ce47702e76977fbc9dfa502e290 /drivers/media/platform/s5p-mfc/regs-mfc-v6.h
parentdfb9f94e8e5e7f73c8e2bcb7d4fb1de57e7c333d (diff)
downloadlinux-3dc7cc24db5986ed5c94c79201f35e3d4610384c.tar.xz
[media] s5p-mfc: Update v6 encoder buffer sizes
The patch updates few encoder buffer sizes for MFC v6.5 as per the udpdated user manual. The same buffer sizes holds good for v7 firmware also. Signed-off-by: Kiran AVND <avnd.kiran@samsung.com> Signed-off-by: Arun Kumar K <arun.kk@samsung.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/regs-mfc-v6.h')
-rw-r--r--drivers/media/platform/s5p-mfc/regs-mfc-v6.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
index 363a97cc7681..2398cdf61341 100644
--- a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
+++ b/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
@@ -374,9 +374,9 @@
#define S5P_FIMV_NUM_PIXELS_IN_MB_COL_V6 16
/* Buffer size requirements defined by hardware */
-#define S5P_FIMV_TMV_BUFFER_SIZE_V6(w, h) (((w) + 1) * ((h) + 1) * 8)
+#define S5P_FIMV_TMV_BUFFER_SIZE_V6(w, h) (((w) + 1) * ((h) + 3) * 8)
#define S5P_FIMV_ME_BUFFER_SIZE_V6(imw, imh, mbw, mbh) \
- ((DIV_ROUND_UP(imw, 64) * DIV_ROUND_UP(imh, 64) * 256) + \
+ (((((imw + 127) / 64) * 16) * DIV_ROUND_UP(imh, 64) * 256) + \
(DIV_ROUND_UP((mbw) * (mbh), 32) * 16))
#define S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V6(w, h) (((w) * 192) + 64)
#define S5P_FIMV_SCRATCH_BUF_SIZE_MPEG4_DEC_V6(w, h) \