From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751020AbdBBIVC (ORCPT ); Thu, 2 Feb 2017 03:21:02 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:23114 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750881AbdBBIVA (ORCPT ); Thu, 2 Feb 2017 03:21:00 -0500 X-AuditID: cbfec7ef-f79d26d00000420c-9b-5892ebea8f46 Subject: Re: [PATCH 05/11] [media] s5p-mfc: Add support for HEVC decoder To: Smitha T Murthy , 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, mchehab@kernel.org, pankaj.dubey@samsung.com, krzk@kernel.org, m.szyprowski@samsung.com, s.nawrocki@samsung.com From: Andrzej Hajda Message-id: <840f5d3f-6075-ea4a-696d-68cc7807df0d@samsung.com> Date: Thu, 02 Feb 2017 09:20:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-version: 1.0 In-reply-to: <0b8c3503-ea16-99dc-d2be-85c122eac564@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDKsWRmVeSWpSXmKPExsWy7djPc7qvXk+KMJjVYWRxZO1VJouZJ9pZ Lc6f38BucbbpDbvFpsfXWC0u75rDZtGzYSurxdojd9ktlm36w2SxaOsXdovDb4CK7+7ZxujA 47FpVSebx+Yl9R59W1YxenzeJOdx5UgjewBrFJdNSmpOZllqkb5dAlfGzLMvmAvWWlT8at/F 3sD4Sq+LkZNDQsBEYt6kE+wQtpjEhXvr2boYuTiEBJYxSjRd+c4E4XxmlNhyez8LTMehi7OY 4ap2v9vFCuE8Y5To7nvNBFIlLOAh8a+hEaxdRKCfUWLX1lvMIAlmgZ2MEs0nKkFsNgFNib+b b7KB2LwCdhI/l65kBLFZBFQlvj0+D3aUqECExKFjt5khagQlfky+B3YGp4C9xJVXzewQMw0k Zkw5zARhy0tsXvMW7DwJgVPsEo+engQaygHkyEpsOsAM8YKLRMOE41C2sMSr41ugASAj0dlx kAmit5tR4lM/KGRAnCmMEv8+zIDqsJY4fPwiK8Q2PolJ26YzQyzglehoE4Io8ZDo2bKOFcJ2 lNi9DOQxUBB1MEn8+byaZQKj/CwkD81C8sQsJE8sYGRexSiSWlqcm55abKhXnJhbXJqXrpec n7uJEZiGTv87/n4H49PmkEOMAhyMSjy8GWKTIoRYE8uKK3MPMUpwMCuJ8Bq8AArxpiRWVqUW 5ccXleakFh9ilOZgURLn3bvgSriQQHpiSWp2ampBahFMlomDU6qBUSnMo2CKpN7i0n08QiaO 91+xPPKZ+T3g/u3smcZW359ETCmct8Z8wpPtS08KrT3cVXdb8XVY/WmX59k3L9w+doLro8GE f/IHps05f4j1y/3Zj8MOrhf937xriWH2prYfWRwOs/mKj/Yd5o3b6zYl1GGifF/QulUrK7c+ SJzJeWHO/B9LP/6ZqaqrxFKckWioxVxUnAgA7zcY+j8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBIsWRmVeSWpSXmKPExsVy+t/xK7q6byZFGGzeymFxZO1VJouZJ9pZ Lc6f38BucbbpDbvFpsfXWC0u75rDZtGzYSurxdojd9ktlm36w2SxaOsXdovDb4CK7+7ZxujA 47FpVSebx+Yl9R59W1YxenzeJOdx5UgjewBrlJtNRmpiSmqRQmpecn5KZl66rVJoiJuuhZJC XmJuqq1ShK5vSJCSQlliTimQZ2SABhycA9yDlfTtEtwyZp59wVyw1qLiV/su9gbGV3pdjJwc EgImEocuzmKGsMUkLtxbzwZiCwksYZQ49yq3i5ELyH7GKHH/7n9GkISwgIfEv4ZGJpCEiEA/ o8SB9+3sEFUdTBLt2y4zgjjMAjsZJe4emM8C0sImoCnxd/NNsLm8AnYSP5euBBvFIqAq8e3x eaBuDg5RgQiJhsPpECWCEj8m3wNr5RSwl7jyqhmshFlAT+L+RS2QMLOAvMTmNW+ZJzAKzELS MQuhahaSqgWMzKsYRVJLi3PTc4sN9YoTc4tL89L1kvNzNzECY3HbsZ+bdzBe2hh8iFGAg1GJ h/eAxKQIIdbEsuLK3EOMEhzMSiK8Bi+AQrwpiZVVqUX58UWlOanFhxhNgT6YyCwlmpwPTBN5 JfGGJobmloZGxhYW5kZGSuK8JR+uhAsJpCeWpGanphakFsH0MXFwSjUwBlUcrpqnEpn0a4uh +xO+6HvmxzcdmG+vbxPcu25H58nWo9HazPzKX/fqztwoFGexRPWIR0732cOnBdXe3q5i2ab0 PpFd7qxf4nf11Yu79vrLef979E7U8+nxDosqx99PuKcskfk8Pfrvfs145ttPzBXem8TvUf/g tKln722Dmr6XJbmlPPVJSizFGYmGWsxFxYkAlNzQJdsCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170202082055eucas1p133b4f8757994a6a6f821e7d90a0fe778 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170118100737epcas1p269ede3c99e71ce55b934945cd20181e1 X-RootMTR: 20170118100737epcas1p269ede3c99e71ce55b934945cd20181e1 References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-6-git-send-email-smitha.t@samsung.com> <0b8c3503-ea16-99dc-d2be-85c122eac564@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02.02.2017 08:58, Andrzej Hajda wrote: > On 18.01.2017 11:02, Smitha T Murthy wrote: >> Add support for codec definition and corresponding buffer >> requirements for HEVC decoder. >> >> Signed-off-by: Smitha T Murthy >> --- >> drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 3 +++ >> drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 3 +++ >> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 + >> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 8 ++++++++ >> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 18 ++++++++++++++++-- >> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 5 +++++ >> 6 files changed, 36 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h >> index 153ee68..a57009a 100644 >> --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h >> +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h >> @@ -32,6 +32,9 @@ >> #define MFC_VERSION_V10 0xA0 >> #define MFC_NUM_PORTS_V10 1 >> >> +/* MFCv10 codec defines*/ >> +#define S5P_FIMV_CODEC_HEVC_DEC 17 >> + >> /* Encoder buffer size for MFC v10.0 */ >> #define ENC_V100_H264_ME_SIZE(x, y) \ >> (((x + 3) * (y + 3) * 8) \ >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c >> index b1b1491..76eca67 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c >> @@ -101,6 +101,9 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx) >> case S5P_MFC_CODEC_VP8_DEC: >> codec_type = S5P_FIMV_CODEC_VP8_DEC_V6; >> break; >> + case S5P_MFC_CODEC_HEVC_DEC: >> + codec_type = S5P_FIMV_CODEC_HEVC_DEC; >> + break; >> case S5P_MFC_CODEC_H264_ENC: >> codec_type = S5P_FIMV_CODEC_H264_ENC_V6; >> break; >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h >> index 998e24b..5c46060 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h >> @@ -79,6 +79,7 @@ static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b) >> #define S5P_MFC_CODEC_H263_DEC 5 >> #define S5P_MFC_CODEC_VC1RCV_DEC 6 >> #define S5P_MFC_CODEC_VP8_DEC 7 >> +#define S5P_MFC_CODEC_HEVC_DEC 17 >> >> #define S5P_MFC_CODEC_H264_ENC 20 >> #define S5P_MFC_CODEC_H264_MVC_ENC 21 >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c >> index 784b28e..9f459b3 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c >> @@ -156,6 +156,14 @@ >> .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | >> MFC_V10_BIT, >> }, >> + { >> + .name = "HEVC Encoded Stream", >> + .fourcc = V4L2_PIX_FMT_HEVC, >> + .codec_mode = S5P_FIMV_CODEC_HEVC_DEC, >> + .type = MFC_FMT_DEC, >> + .num_planes = 1, >> + .versions = MFC_V10_BIT, >> + }, >> }; >> >> #define NUM_FORMATS ARRAY_SIZE(formats) >> 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 369210a..b6cb280 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c >> @@ -220,6 +220,13 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) >> S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); >> ctx->bank1.size = ctx->scratch_buf_size; >> break; >> + case S5P_MFC_CODEC_HEVC_DEC: >> + mfc_debug(2, "Use min scratch buffer size\n"); >> + ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, 256); > Again alignment of something which should be already aligned, and magic > number instead of S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6. > >> + ctx->bank1.size = >> + ctx->scratch_buf_size + >> + (ctx->mv_count * ctx->mv_size); >> + break; >> case S5P_MFC_CODEC_H264_ENC: >> if (IS_MFCV10(dev)) { >> mfc_debug(2, "Use min scratch buffer size\n"); >> @@ -322,6 +329,7 @@ static int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) >> switch (ctx->codec_mode) { >> case S5P_MFC_CODEC_H264_DEC: >> case S5P_MFC_CODEC_H264_MVC_DEC: >> + case S5P_MFC_CODEC_HEVC_DEC: >> ctx->ctx.size = buf_size->h264_dec_ctx; >> break; >> case S5P_MFC_CODEC_MPEG4_DEC: >> @@ -438,6 +446,10 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx) >> ctx->img_height); >> ctx->mv_size = ALIGN(ctx->mv_size, 16); >> } >> + } else if (ctx->codec_mode == S5P_MFC_CODEC_HEVC_DEC) { >> + ctx->mv_size = s5p_mfc_dec_hevc_mv_size(ctx->img_width, >> + ctx->img_height); >> + ctx->mv_size = ALIGN(ctx->mv_size, 32); > Again, unnecessary alignment, result of s5p_mfc_dec_hevc_mv_size is > already aligned to 256. > >> } else { >> ctx->mv_size = 0; >> } >> @@ -526,7 +538,8 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) >> buf_size1 -= ctx->scratch_buf_size; >> >> if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC || >> - ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){ >> + ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC || >> + ctx->codec_mode == S5P_FIMV_CODEC_HEVC_DEC) { >> writel(ctx->mv_size, mfc_regs->d_mv_buffer_size); >> writel(ctx->mv_count, mfc_regs->d_num_mv); >> } >> @@ -549,7 +562,8 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) >> mfc_regs->d_second_plane_dpb + i * 4); >> } >> if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC || >> - ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) { >> + ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC || >> + ctx->codec_mode == S5P_MFC_CODEC_HEVC_DEC) { >> for (i = 0; i < ctx->mv_count; i++) { >> /* To test alignment */ >> align_gap = buf_addr1; >> 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 2b5a9f4..2e404d8 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h >> @@ -29,6 +29,11 @@ >> #define enc_lcu_width(x_size) ((x_size + 31) / 32) >> #define enc_lcu_height(y_size) ((y_size + 31) / 32) >> >> +#define dec_lcu_width(x_size) ((x_size + 63) / 64) > It could be replaced with: > > +#define dec_lcu_width(x_size) ALIGN(x_size, 64) Ups, DIV_ROUND_UP should be used instead of ALIGN, here and below. > > >> +#define dec_lcu_height(y_size) ((y_size + 63) / 64) > The same here. >> +#define s5p_mfc_dec_hevc_mv_size(x, y) \ >> + (dec_lcu_width(x) * dec_lcu_height(y) * 256 + 512) >> + > If dec_lcu_(width|height) are not used anywhere else, you can just > squash them here: > > #define s5p_mfc_dec_hevc_mv_size(x, y) (ALIGN(x, 64) * ALIGN(y, 64) * 256 + 512) > > And if there is only one use of this macro, maybe it would be good to > just hardcode it there. > > Regards > Andrzej > >> /* Definition */ >> #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) >> #define ENC_MULTI_SLICE_BIT_MIN 2800 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: a.hajda@samsung.com (Andrzej Hajda) Date: Thu, 02 Feb 2017 09:20:53 +0100 Subject: [PATCH 05/11] [media] s5p-mfc: Add support for HEVC decoder In-Reply-To: <0b8c3503-ea16-99dc-d2be-85c122eac564@samsung.com> References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-6-git-send-email-smitha.t@samsung.com> <0b8c3503-ea16-99dc-d2be-85c122eac564@samsung.com> Message-ID: <840f5d3f-6075-ea4a-696d-68cc7807df0d@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 02.02.2017 08:58, Andrzej Hajda wrote: > On 18.01.2017 11:02, Smitha T Murthy wrote: >> Add support for codec definition and corresponding buffer >> requirements for HEVC decoder. >> >> Signed-off-by: Smitha T Murthy >> --- >> drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 3 +++ >> drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 3 +++ >> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 + >> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 8 ++++++++ >> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 18 ++++++++++++++++-- >> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 5 +++++ >> 6 files changed, 36 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h >> index 153ee68..a57009a 100644 >> --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h >> +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h >> @@ -32,6 +32,9 @@ >> #define MFC_VERSION_V10 0xA0 >> #define MFC_NUM_PORTS_V10 1 >> >> +/* MFCv10 codec defines*/ >> +#define S5P_FIMV_CODEC_HEVC_DEC 17 >> + >> /* Encoder buffer size for MFC v10.0 */ >> #define ENC_V100_H264_ME_SIZE(x, y) \ >> (((x + 3) * (y + 3) * 8) \ >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c >> index b1b1491..76eca67 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c >> @@ -101,6 +101,9 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx) >> case S5P_MFC_CODEC_VP8_DEC: >> codec_type = S5P_FIMV_CODEC_VP8_DEC_V6; >> break; >> + case S5P_MFC_CODEC_HEVC_DEC: >> + codec_type = S5P_FIMV_CODEC_HEVC_DEC; >> + break; >> case S5P_MFC_CODEC_H264_ENC: >> codec_type = S5P_FIMV_CODEC_H264_ENC_V6; >> break; >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h >> index 998e24b..5c46060 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h >> @@ -79,6 +79,7 @@ static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b) >> #define S5P_MFC_CODEC_H263_DEC 5 >> #define S5P_MFC_CODEC_VC1RCV_DEC 6 >> #define S5P_MFC_CODEC_VP8_DEC 7 >> +#define S5P_MFC_CODEC_HEVC_DEC 17 >> >> #define S5P_MFC_CODEC_H264_ENC 20 >> #define S5P_MFC_CODEC_H264_MVC_ENC 21 >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c >> index 784b28e..9f459b3 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c >> @@ -156,6 +156,14 @@ >> .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | >> MFC_V10_BIT, >> }, >> + { >> + .name = "HEVC Encoded Stream", >> + .fourcc = V4L2_PIX_FMT_HEVC, >> + .codec_mode = S5P_FIMV_CODEC_HEVC_DEC, >> + .type = MFC_FMT_DEC, >> + .num_planes = 1, >> + .versions = MFC_V10_BIT, >> + }, >> }; >> >> #define NUM_FORMATS ARRAY_SIZE(formats) >> 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 369210a..b6cb280 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c >> @@ -220,6 +220,13 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx) >> S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6); >> ctx->bank1.size = ctx->scratch_buf_size; >> break; >> + case S5P_MFC_CODEC_HEVC_DEC: >> + mfc_debug(2, "Use min scratch buffer size\n"); >> + ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, 256); > Again alignment of something which should be already aligned, and magic > number instead of S5P_FIMV_SCRATCH_BUFFER_ALIGN_V6. > >> + ctx->bank1.size = >> + ctx->scratch_buf_size + >> + (ctx->mv_count * ctx->mv_size); >> + break; >> case S5P_MFC_CODEC_H264_ENC: >> if (IS_MFCV10(dev)) { >> mfc_debug(2, "Use min scratch buffer size\n"); >> @@ -322,6 +329,7 @@ static int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx) >> switch (ctx->codec_mode) { >> case S5P_MFC_CODEC_H264_DEC: >> case S5P_MFC_CODEC_H264_MVC_DEC: >> + case S5P_MFC_CODEC_HEVC_DEC: >> ctx->ctx.size = buf_size->h264_dec_ctx; >> break; >> case S5P_MFC_CODEC_MPEG4_DEC: >> @@ -438,6 +446,10 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx) >> ctx->img_height); >> ctx->mv_size = ALIGN(ctx->mv_size, 16); >> } >> + } else if (ctx->codec_mode == S5P_MFC_CODEC_HEVC_DEC) { >> + ctx->mv_size = s5p_mfc_dec_hevc_mv_size(ctx->img_width, >> + ctx->img_height); >> + ctx->mv_size = ALIGN(ctx->mv_size, 32); > Again, unnecessary alignment, result of s5p_mfc_dec_hevc_mv_size is > already aligned to 256. > >> } else { >> ctx->mv_size = 0; >> } >> @@ -526,7 +538,8 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) >> buf_size1 -= ctx->scratch_buf_size; >> >> if (ctx->codec_mode == S5P_FIMV_CODEC_H264_DEC || >> - ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC){ >> + ctx->codec_mode == S5P_FIMV_CODEC_H264_MVC_DEC || >> + ctx->codec_mode == S5P_FIMV_CODEC_HEVC_DEC) { >> writel(ctx->mv_size, mfc_regs->d_mv_buffer_size); >> writel(ctx->mv_count, mfc_regs->d_num_mv); >> } >> @@ -549,7 +562,8 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx) >> mfc_regs->d_second_plane_dpb + i * 4); >> } >> if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC || >> - ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) { >> + ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC || >> + ctx->codec_mode == S5P_MFC_CODEC_HEVC_DEC) { >> for (i = 0; i < ctx->mv_count; i++) { >> /* To test alignment */ >> align_gap = buf_addr1; >> 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 2b5a9f4..2e404d8 100644 >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h >> @@ -29,6 +29,11 @@ >> #define enc_lcu_width(x_size) ((x_size + 31) / 32) >> #define enc_lcu_height(y_size) ((y_size + 31) / 32) >> >> +#define dec_lcu_width(x_size) ((x_size + 63) / 64) > It could be replaced with: > > +#define dec_lcu_width(x_size) ALIGN(x_size, 64) Ups, DIV_ROUND_UP should be used instead of ALIGN, here and below. > > >> +#define dec_lcu_height(y_size) ((y_size + 63) / 64) > The same here. >> +#define s5p_mfc_dec_hevc_mv_size(x, y) \ >> + (dec_lcu_width(x) * dec_lcu_height(y) * 256 + 512) >> + > If dec_lcu_(width|height) are not used anywhere else, you can just > squash them here: > > #define s5p_mfc_dec_hevc_mv_size(x, y) (ALIGN(x, 64) * ALIGN(y, 64) * 256 + 512) > > And if there is only one use of this macro, maybe it would be good to > just hardcode it there. > > Regards > Andrzej > >> /* Definition */ >> #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) >> #define ENC_MULTI_SLICE_BIT_MIN 2800 >