Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752267AbdDCINq (ORCPT ); Mon, 3 Apr 2017 04:13:46 -0400 Received: from lb2-smtp-cloud3.xs4all.net ([194.109.24.26]:34656 "EHLO lb2-smtp-cloud3.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751986AbdDCINj (ORCPT ); Mon, 3 Apr 2017 04:13:39 -0400 Subject: Re: [Patch v3 06/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 References: <1490951200-32070-1-git-send-email-smitha.t@samsung.com> <1490951200-32070-7-git-send-email-smitha.t@samsung.com> 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, s.nawrocki@samsung.com From: Hans Verkuil Message-ID: Date: Mon, 3 Apr 2017 10:13:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1490951200-32070-7-git-send-email-smitha.t@samsung.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3265 Lines: 82 On 03/31/2017 11:06 AM, Smitha T Murthy wrote: > Add support for codec definition and corresponding buffer > requirements for HEVC decoder. > > Signed-off-by: Smitha T Murthy > Reviewed-by: Andrzej Hajda > --- > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 1 + > 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 | 17 +++++++++++++++-- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 3 +++ > 6 files changed, 31 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 3f0dab3..953a073 100644 > --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > @@ -33,6 +33,7 @@ > #define MFC_NUM_PORTS_V10 1 > > /* MFCv10 codec defines*/ > +#define S5P_FIMV_CODEC_HEVC_DEC 17 > #define S5P_FIMV_CODEC_HEVC_ENC 26 > > /* Encoder buffer size for MFC v10.0 */ > 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 8368d5c2..f49fa34 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 db6d9fa..4fdaec2 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > @@ -144,6 +144,14 @@ static struct s5p_mfc_fmt formats[] = { > .num_planes = 1, > .versions = MFC_V6PLUS_BITS, > }, > + { > + .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, > + }, > }; The '.name' should probably be removed completely in this driver. The name is now filled in by v4l_fill_fmtdesc() in v4l2-ioctl.c, so there is no longer any need to set it in a driver. This can be done in a separate patch before this patch is applied. Doing this in v4l2-ioctl.c ensures consistent format naming across drivers. Regards, Hans