From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752224AbdARJmT (ORCPT ); Wed, 18 Jan 2017 04:42:19 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:60674 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752128AbdARJmP (ORCPT ); Wed, 18 Jan 2017 04:42:15 -0500 X-AuditID: b6c32a2d-f79166d000001fef-6d-587f387462a8 From: Smitha T Murthy To: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kyungmin.park@samsung.com, kamil@wypas.org, jtp.park@samsung.com, a.hajda@samsung.com, mchehab@kernel.org, pankaj.dubey@samsung.com, krzk@kernel.org, m.szyprowski@samsung.com, Smitha T Murthy Subject: [PATCH] [media] s5p-mfc: Align stream buffer and CPB buffer to 512 Date: Wed, 18 Jan 2017 15:07:03 +0530 Message-id: <1484732223-24670-1-git-send-email-smitha.t@samsung.com> X-Mailer: git-send-email 1.7.2.3 X-Brightmail-Tracker: H4sIAAAAAAAAAzWSe0hTURzHO7u7uzdxdVtmB6UYl4KUXN6b06tlT6uFIYpK9mLd9KDDvdzd JI1Ss5emWRlJZGCmhQMfLZWsCJuGotVcmoSiFRaFRCJqJT1s7uZ/n/P7fb+/x+FHYopuPIDU Ga3IYuT1tMxH2toRFBRi4/JSQvtuSrihhlc411n/RsLd6D6Pcy5XE8G9PP2V4BxjgzjX/6hS xpU0teBcfecIwd11/JZw1S3TBDfypBVs89U47EUyzYOaPM2lZjvQTDlWawY6C4h4/CDanIH4 NGRRImOqKU1nTI+mYxO1O7Xq8FAmhInkImilkTegaDpmX3zIbp3eMx6tzOb1Nk8onhcEesOW zRaTzYqUGSbBGk0fYhhWxYRGqFiWVYWxR6JYtUdyFGW4aqxm97LjU9fKiHxQsbQYLCYhFQaf Trtxkf1h32ijrBj4kAqqFsDBOScuPs5L4JnP1dIFh7vkIiEmKgGcGav32hXUHIDdLwzzLKPW w+8TvbJ59qMQHG8QNRj1HkD3BW98ORULyyZ+e4qSpJRaCyt6hfmwnIqBrW2NMrGXEo6/rff2 glQhAYu+/PXqIbUKOtoxURMDh56NAJGXw/GuZkLkQPindgj89wJ4q7Xw/wKXAaw7axN5K2wf qJSKsy2Bpb8+SsT6cnjhnEJEDXTY/UT1dlhqf4aJ2x6Btx/PYJdBYBVYZAf+yCwY0pGgNrMq gTcINmO6KtVkcADvFQWHPATTVbFOQJGA9pWbu06lKHA+W8gxOAEkMdpP/k6dl6KQp/E5uchi 0lpseiQ4gdrzMVewgBWpJs9NGq1aJiycCWMj2fBIZiNLr5RXHd+UoqDSeSvKRMiMLAs+Cbk4 IB/QktddFfoPP8ZTn7t8s88lEIPt39qyKsNzq+vuOf2zdFXHdvVnsvu35u7d4TNckmw9eXhL UsfZnE/O4dEopysPVMi7rvYkTEaUz0Ynv1CdnDxwP/tOxJ7ZxKCfJwqIpHK5xf96YPHsWPC6 uCWmKeDewE3lrClktL7YIJrrKYzT0VIhg2eCMYvA/wPqx8TOWwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsVy+t9jQd0Si/oIg8P3GC1urTvHanFk7VUm i5kn2lktzp/fwG5xtukNu8Wmx9dYLS7vmsNm0bNhK6vF2iN32S2WbfrDZLFo6xd2i7t7tjE6 8HhsWtXJ5rF5Sb1H35ZVjB6fN8l5XDnSyB7AGuVmk5GamJJapJCal5yfkpmXbqsUGuKma6Gk kJeYm2qrFKHrGxKkpFCWmFMK5BkZoAEH5wD3YCV9uwS3jPNLSgouClZ8ntLP3sA4nb+LkZND QsBE4mJPNzuELSZx4d56ti5GLg4hgVmMEtu+3mGHcBqZJN41dzGCVLEJ6Eh8e3+aDcQWEUiV WLv1PCtIEbPAA0aJcz+ms4IkhAW8Jfrf/2HpYuTgYBFQlZh+uhgkzCvgIrFt53o2iG0KEq9u rGWfwMi9gJFhFaNEakFyQXFSeq5RXmq5XnFibnFpXrpecn7uJkZwSD+T3sF4eJf7IUYBDkYl Ht4A0boIIdbEsuLK3EOMEhzMSiK8903rI4R4UxIrq1KL8uOLSnNSiw8xmgLtn8gsJZqcD4y3 vJJ4QxNzE3NjAwtzS0sTIyVx3sbZz8KFBNITS1KzU1MLUotg+pg4OKUaGLc5qH7UUJ7nvqe7 MstwljOXR0FDk/RLlWouRlameYyypmdm79wqM2Pi+ur0dSFLlC+f4Dr+I/fAtGYdvctJE1dN 2KrM6C31YH9sYO3iCTOSt+T/Tl70yvBjllStoGaEb8KvgxsPThfcuCf1i2TA8+/W12OTLpkp zuO59/zXk5QM/7YS0ZULFyixFGckGmoxFxUnAgAwvclkfwIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170118094212epcas5p22e588016d2b330dcd0b99b6e1012c744 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?U21pdGhhIFQgTXVydGh5G1NTSVItVHVybiBLZXkgU29sdXRp?= =?UTF-8?B?b25zG+yCvOyEseyghOyekBtMZWFkIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?U21pdGhhIFQgTXVydGh5G1NTSVItVHVybiBLZXkgU29sdXRp?= =?UTF-8?B?b25zG1NhbXN1bmcgRWxlY3Ryb25pY3MbTGVhZCBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG1NXQUhRG0MxMElEMDdJRDAxMDk5Nw==?= CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20170118094212epcas5p22e588016d2b330dcd0b99b6e1012c744 X-RootMTR: 20170118094212epcas5p22e588016d2b330dcd0b99b6e1012c744 References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From MFCv6 onwards encoder stream buffer and decoder CPB buffer need to be aligned with 512. Signed-off-by: Smitha T Murthy --- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++++++++ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 3 +++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c index d6f207e..57da798 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c @@ -408,8 +408,15 @@ static int s5p_mfc_set_dec_stream_buffer_v6(struct s5p_mfc_ctx *ctx, struct s5p_mfc_dev *dev = ctx->dev; const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs; struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size; + size_t cpb_buf_size; mfc_debug_enter(); + cpb_buf_size = ALIGN(buf_size->cpb, CPB_ALIGN); + if (strm_size >= set_strm_size_max(cpb_buf_size)) { + mfc_debug(2, "Decrease strm_size : %u -> %zu, gap : %d\n", + strm_size, set_strm_size_max(cpb_buf_size), CPB_ALIGN); + strm_size = set_strm_size_max(cpb_buf_size); + } mfc_debug(2, "inst_no: %d, buf_addr: 0x%08x,\n" "buf_size: 0x%08x (%d)\n", ctx->inst_no, buf_addr, strm_size, strm_size); @@ -519,6 +526,8 @@ static int s5p_mfc_set_enc_stream_buffer_v6(struct s5p_mfc_ctx *ctx, struct s5p_mfc_dev *dev = ctx->dev; const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs; + size = ALIGN(size, 512); + writel(addr, mfc_regs->e_stream_buffer_addr); /* 16B align */ writel(size, mfc_regs->e_stream_buffer_size); diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h index 8055848..16a7b1d 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h @@ -40,6 +40,9 @@ #define FRAME_DELTA_H264_H263 1 #define TIGHT_CBR_MAX 10 +#define CPB_ALIGN 512 +#define set_strm_size_max(cpb_max) ((cpb_max) - CPB_ALIGN) + struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void); const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev); #endif /* S5P_MFC_OPR_V6_H_ */ -- 1.7.2.3