From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbdARPKx (ORCPT ); Wed, 18 Jan 2017 10:10:53 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:22061 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751706AbdARPKq (ORCPT ); Wed, 18 Jan 2017 10:10:46 -0500 X-AuditID: cbfec7f1-f793f6d000007796-e2-587f857264b0 Subject: Re: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 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, Rob Herring , devicetree@vger.kernel.org From: Andrzej Hajda Message-id: Date: Wed, 18 Jan 2017 16:10:39 +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: <1484733729-25371-3-git-send-email-smitha.t@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA02Sb0hTYRTGeb27u1dpcp1WJ7MJM5OC1ELyZmVGCrMvBVJJfciRF7Wcyr3T tJCZqM0/qKiQLm2jzEzSZOoy0axt6Cj8UzMjh6ImojIrs0ClLOed4LffOed5OOd5eUlMbMC9 yaQUJcOmyJOlQjeBoW918DCbr4oNru3xoLXmQZw2N39yoWss93B6aKiVoAdy7QSt/zqK09au WiFd0tqB083mcYJu0P9xoR91/CLo/B4zQZvsG47xbgOKcJfpmwqFsrZ6lay0vQnJlvUS2Yj5 LnEBv+J2Mp5JTspg2KDwOLdEy8NaIm0xKHO01I7noN8HipArCVQIGD6qCZ53wfDEC2ERciPF 1BMEU4OzBF8sI2jR2Igth22mGuMHDQgKp0zOYhbB8NPRTZUnFQMV3a9xx8CLKkPQ1TG2qcKo VQT2mTXMoRJSB+Fv2xehg0VUOExqVzfdAsof8od1AgfvpGLB2GfDeI0HrFRObPZdqSgw5U7i DsaoYKiuMrnw7Attzxcx/tYxAqaHPIoQucH7QP/G2Y6Et3OfEc+esNDf7ozmA9bKYoHjTqCK EfwssxB8UYVg/Ue1030CTP0fnIvdocJwH+MXiEBdIOYlMjC+6sV5PgPrFf04/0RWBO+0BYJy 5KvZlkezLYNmWwYdwpqQF5POKRIY7mggJ1dw6SkJgddTFXq08Zver/cvdaLvljAjokgk3SFS s6pYMS7P4LIURgQkJvUSaVUbLVG8POs2w6ZeY9OTGc6I9pIC6W5Rt27ksphKkCuZmwyTxrBb UxfS1TsHlXSY4r5lntqz4vPMEl0SKTnrd0NnLZ66NJ3huRoyf2fpnx+W56odSDM+7FLXTpeP eody59YuzhflSaJ7X841BWSfTm6pyxkXPfY8r1RlR2SZQtkQyVKv//7wW2m5UTZ39nh9gETQ 2NtoV8Wo7XW6Gr8Hg2MLYcfq6dirnUqGkwq4RPmRQxjLyf8DvNsSyUkDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMIsWRmVeSWpSXmKPExsVy+t/xK7o5rfURBtN+q1nMP3KO1eLI2qtM FjNPtLNanD+/gd3ibNMbdotNj6+xWlzeNYfNomfDVlaLtUfuslss2/SHyWLR1i/sFq17j7Bb HH4D1HF3zzZGBz6PTas62Tw2L6n36NuyitHj8yY5jytHGtkDWKPcbDJSE1NSixRS85LzUzLz 0m2VQkPcdC2UFPISc1NtlSJ0fUOClBTKEnNKgTwjAzTg4BzgHqykb5fglnFi3hz2grf6Fdf6 3rA2MH5V62Lk5JAQMJG4/WQGM4QtJnHh3nq2LkYuDiGBJYwS2+4tZodwnjFKHJ85EaxKWCBY YtKefawgCRGBfkaJA+/boaouM0pcaL7ABOIwC/xklNi/ayM7SAubgKbE38032UBsXgE7iQfz f4LFWQRUJVovLGDpYuTgEBWIkGg4nA5RIijxY/I9FhCbU8BV4nDTA1aQEmYBPYn7F7VAwswC 8hKb17xlnsAoMAtJxyyEqllIqhYwMq9iFEktLc5Nzy020itOzC0uzUvXS87P3cQIjNBtx35u 2cHY9S74EKMAB6MSD29HUX2EEGtiWXFl7iFGCQ5mJRFe8xagEG9KYmVValF+fFFpTmrxIUZT oA8mMkuJJucDk0deSbyhiaG5paGRsYWFuZGRkjjv1A9XwoUE0hNLUrNTUwtSi2D6mDg4pRoY RWY8eWKpLGq2SOj9i42PW6ZKTvgydcbKwBkhN09x9J9TO8wzSde1an/QllCO3t9mnaxm4t9l 9BLDd/y/dW2bv85KNjcNpoZt3sFJO5/Hban3a30anst40sS0SlzCZvqKDxvPPrrQXVvMqnhp aV5dnmKsMH9xVVr7m2/rX589tTPp85bPTMF3lFiKMxINtZiLihMBlZ1mZOYCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170118151041eucas1p1643d4bbddb48c0451a4dba26aeb90bfa X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 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: 20170118100723epcas5p132e0ebfad38261bed95cffc47334f9dc X-RootMTR: 20170118100723epcas5p132e0ebfad38261bed95cffc47334f9dc References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-3-git-send-email-smitha.t@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 18.01.2017 11:02, Smitha T Murthy wrote: > Adding the support for MFC v10.10, with new register file and > necessary hw control, decoder, encoder and structural changes. > > CC: Rob Herring > CC: devicetree@vger.kernel.org > Signed-off-by: Smitha T Murthy > --- > .../devicetree/bindings/media/s5p-mfc.txt | 1 + > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > 9 files changed, 118 insertions(+), 33 deletions(-) > create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt > index 2c90128..b70c613 100644 > --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt > +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt > @@ -13,6 +13,7 @@ Required properties: > (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC > (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC > (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC > + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC Could you specify explicitly SoC version(s), Exynos7 is misleading. Btw are there plans to upstream platforms using this MFC? > > - reg : Physical base address of the IP registers and length of memory > mapped region. > diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > new file mode 100644 > index 0000000..bd671a5 > --- /dev/null > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > @@ -0,0 +1,36 @@ > +/* > + * Register definition file for Samsung MFC V10.x Interface (FIMV) driver > + * > + * Copyright (c) 2017 Samsung Electronics Co., Ltd. > + * http://www.samsung.com/ > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef _REGS_MFC_V10_H > +#define _REGS_MFC_V10_H > + > +#include > +#include "regs-mfc-v8.h" > + > +/* MFCv10 register definitions*/ > +#define S5P_FIMV_MFC_CLOCK_OFF_V10 0x7120 > +#define S5P_FIMV_MFC_STATE_V10 0x7124 > + > +/* MFCv10 Context buffer sizes */ > +#define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */ > +#define MFC_H264_DEC_CTX_BUF_SIZE_V10 (2 * SZ_1M) /* 2MB */ > +#define MFC_OTHER_DEC_CTX_BUF_SIZE_V10 (20 * SZ_1K) /* 20KB */ > +#define MFC_H264_ENC_CTX_BUF_SIZE_V10 (100 * SZ_1K) /* 100KB */ > +#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */ > + > +/* MFCv10 variant defines */ > +#define MAX_FW_SIZE_V10 (SZ_1M) /* 1MB */ > +#define MAX_CPB_SIZE_V10 (3 * SZ_1M) /* 3MB */ > +#define MFC_VERSION_V10 0xA0 > +#define MFC_NUM_PORTS_V10 1 > + > +#endif /*_REGS_MFC_V10_H*/ > + > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c > index bb0a588..a043cce 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c > @@ -1542,6 +1542,33 @@ static int s5p_mfc_resume(struct device *dev) > .num_clocks = 3, > }; > > +static struct s5p_mfc_buf_size_v6 mfc_buf_size_v10 = { > + .dev_ctx = MFC_CTX_BUF_SIZE_V10, > + .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V10, > + .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V10, > + .h264_enc_ctx = MFC_H264_ENC_CTX_BUF_SIZE_V10, > + .other_enc_ctx = MFC_OTHER_ENC_CTX_BUF_SIZE_V10, > +}; > + > +static struct s5p_mfc_buf_size buf_size_v10 = { > + .fw = MAX_FW_SIZE_V10, > + .cpb = MAX_CPB_SIZE_V10, > + .priv = &mfc_buf_size_v10, > +}; > + > +static struct s5p_mfc_buf_align mfc_buf_align_v10 = { > + .base = 0, > +}; > + > +static struct s5p_mfc_variant mfc_drvdata_v10 = { > + .version = MFC_VERSION_V10, > + .version_bit = MFC_V10_BIT, > + .port_num = MFC_NUM_PORTS_V10, > + .buf_size = &buf_size_v10, > + .buf_align = &mfc_buf_align_v10, > + .fw_name[0] = "s5p-mfc-v10.fw", Is firmware file publicly available? Sent to firmware repository? > +}; > + > static const struct of_device_id exynos_mfc_match[] = { > { > .compatible = "samsung,mfc-v5", > @@ -1558,6 +1585,9 @@ static int s5p_mfc_resume(struct device *dev) > }, { > .compatible = "samsung,exynos5433-mfc", > .data = &mfc_drvdata_v8_5433, > + }, { > + .compatible = "samsung,mfc-v10", > + .data = &mfc_drvdata_v10, > }, > {}, > }; > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > index b45d18c..1941c63 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > @@ -23,7 +23,7 @@ > #include > #include > #include "regs-mfc.h" > -#include "regs-mfc-v8.h" > +#include "regs-mfc-v10.h" > > #define S5P_MFC_NAME "s5p-mfc" > > @@ -723,11 +723,13 @@ struct mfc_control { > #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0) > #define IS_MFCV7_PLUS(dev) (dev->variant->version >= 0x70 ? 1 : 0) > #define IS_MFCV8_PLUS(dev) (dev->variant->version >= 0x80 ? 1 : 0) > +#define IS_MFCV10(dev) (dev->variant->version >= 0xA0 ? 1 : 0) > > #define MFC_V5_BIT BIT(0) > #define MFC_V6_BIT BIT(1) > #define MFC_V7_BIT BIT(2) > #define MFC_V8_BIT BIT(3) > +#define MFC_V10_BIT BIT(5) I think you can use BIT(4) here. Regards Andrzej From mboxrd@z Thu Jan 1 00:00:00 1970 From: a.hajda@samsung.com (Andrzej Hajda) Date: Wed, 18 Jan 2017 16:10:39 +0100 Subject: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 In-Reply-To: <1484733729-25371-3-git-send-email-smitha.t@samsung.com> References: <1484733729-25371-1-git-send-email-smitha.t@samsung.com> <1484733729-25371-3-git-send-email-smitha.t@samsung.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 18.01.2017 11:02, Smitha T Murthy wrote: > Adding the support for MFC v10.10, with new register file and > necessary hw control, decoder, encoder and structural changes. > > CC: Rob Herring > CC: devicetree at vger.kernel.org > Signed-off-by: Smitha T Murthy > --- > .../devicetree/bindings/media/s5p-mfc.txt | 1 + > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > 9 files changed, 118 insertions(+), 33 deletions(-) > create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt > index 2c90128..b70c613 100644 > --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt > +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt > @@ -13,6 +13,7 @@ Required properties: > (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC > (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC > (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC > + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC Could you specify explicitly SoC version(s), Exynos7 is misleading. Btw are there plans to upstream platforms using this MFC? > > - reg : Physical base address of the IP registers and length of memory > mapped region. > diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > new file mode 100644 > index 0000000..bd671a5 > --- /dev/null > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > @@ -0,0 +1,36 @@ > +/* > + * Register definition file for Samsung MFC V10.x Interface (FIMV) driver > + * > + * Copyright (c) 2017 Samsung Electronics Co., Ltd. > + * http://www.samsung.com/ > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef _REGS_MFC_V10_H > +#define _REGS_MFC_V10_H > + > +#include > +#include "regs-mfc-v8.h" > + > +/* MFCv10 register definitions*/ > +#define S5P_FIMV_MFC_CLOCK_OFF_V10 0x7120 > +#define S5P_FIMV_MFC_STATE_V10 0x7124 > + > +/* MFCv10 Context buffer sizes */ > +#define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */ > +#define MFC_H264_DEC_CTX_BUF_SIZE_V10 (2 * SZ_1M) /* 2MB */ > +#define MFC_OTHER_DEC_CTX_BUF_SIZE_V10 (20 * SZ_1K) /* 20KB */ > +#define MFC_H264_ENC_CTX_BUF_SIZE_V10 (100 * SZ_1K) /* 100KB */ > +#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */ > + > +/* MFCv10 variant defines */ > +#define MAX_FW_SIZE_V10 (SZ_1M) /* 1MB */ > +#define MAX_CPB_SIZE_V10 (3 * SZ_1M) /* 3MB */ > +#define MFC_VERSION_V10 0xA0 > +#define MFC_NUM_PORTS_V10 1 > + > +#endif /*_REGS_MFC_V10_H*/ > + > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c > index bb0a588..a043cce 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c > @@ -1542,6 +1542,33 @@ static int s5p_mfc_resume(struct device *dev) > .num_clocks = 3, > }; > > +static struct s5p_mfc_buf_size_v6 mfc_buf_size_v10 = { > + .dev_ctx = MFC_CTX_BUF_SIZE_V10, > + .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V10, > + .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V10, > + .h264_enc_ctx = MFC_H264_ENC_CTX_BUF_SIZE_V10, > + .other_enc_ctx = MFC_OTHER_ENC_CTX_BUF_SIZE_V10, > +}; > + > +static struct s5p_mfc_buf_size buf_size_v10 = { > + .fw = MAX_FW_SIZE_V10, > + .cpb = MAX_CPB_SIZE_V10, > + .priv = &mfc_buf_size_v10, > +}; > + > +static struct s5p_mfc_buf_align mfc_buf_align_v10 = { > + .base = 0, > +}; > + > +static struct s5p_mfc_variant mfc_drvdata_v10 = { > + .version = MFC_VERSION_V10, > + .version_bit = MFC_V10_BIT, > + .port_num = MFC_NUM_PORTS_V10, > + .buf_size = &buf_size_v10, > + .buf_align = &mfc_buf_align_v10, > + .fw_name[0] = "s5p-mfc-v10.fw", Is firmware file publicly available? Sent to firmware repository? > +}; > + > static const struct of_device_id exynos_mfc_match[] = { > { > .compatible = "samsung,mfc-v5", > @@ -1558,6 +1585,9 @@ static int s5p_mfc_resume(struct device *dev) > }, { > .compatible = "samsung,exynos5433-mfc", > .data = &mfc_drvdata_v8_5433, > + }, { > + .compatible = "samsung,mfc-v10", > + .data = &mfc_drvdata_v10, > }, > {}, > }; > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > index b45d18c..1941c63 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > @@ -23,7 +23,7 @@ > #include > #include > #include "regs-mfc.h" > -#include "regs-mfc-v8.h" > +#include "regs-mfc-v10.h" > > #define S5P_MFC_NAME "s5p-mfc" > > @@ -723,11 +723,13 @@ struct mfc_control { > #define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 : 0) > #define IS_MFCV7_PLUS(dev) (dev->variant->version >= 0x70 ? 1 : 0) > #define IS_MFCV8_PLUS(dev) (dev->variant->version >= 0x80 ? 1 : 0) > +#define IS_MFCV10(dev) (dev->variant->version >= 0xA0 ? 1 : 0) > > #define MFC_V5_BIT BIT(0) > #define MFC_V6_BIT BIT(1) > #define MFC_V7_BIT BIT(2) > #define MFC_V8_BIT BIT(3) > +#define MFC_V10_BIT BIT(5) I think you can use BIT(4) here. Regards Andrzej