From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751302AbdAaJie (ORCPT ); Tue, 31 Jan 2017 04:38:34 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:45811 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751073AbdAaJi0 (ORCPT ); Tue, 31 Jan 2017 04:38:26 -0500 X-AuditID: b6c32a36-f79dd6d000001a4f-da-58905ac5395f Subject: Re: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 From: Smitha T Murthy To: Andrzej Hajda Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, 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 In-reply-to: Content-type: text/plain; charset=UTF-8 Date: Tue, 31 Jan 2017 14:42:15 +0530 Message-id: <1485853935.16927.22.camel@smitha-fedora> MIME-version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-1.fc12) Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNJsWRmVeSWpSXmKPExsWy7bCmru7RqAkRBuvbzSxurTvHajH/CJA4 svYqk8XME+2sFufPb2C3ONv0ht1i0+NrrBaXd81hs+jZsJXVYu2Ru+wWyzb9YbJYtPULu0Xr 3iPsFofftLM68HlsWtXJ5rF5Sb1H35ZVjB6fN8l5XDnSyB7AGpVqk5GamJJapJCal5yfkpmX bqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQN0qJJCWWJOKVAoILG4WEnfzqYov7Qk VSEjv7jEVina0NBIz9DAXM/IyEjPxCjWysgUqCQhNWP1l9dMBZ3mFZ3d+5gbGN9qdzFyckgI mEg0H3rBCGGLSVy4t56ti5GLQ0hgB6PE91tr2SGcz4wS8y4/ZYLpeLh5HTOILSSwgVHi4z1D EFtYIFhi0p59rCA2m4COxLf3p9lAbBEBdYnZJ+8wgwxiFrjHJDH54U+gBAcHp4C9xLseT5Aa ZgFNidbtv9lBbBYBVYmb87+DzecVMJXY+eIgWDmvgKDE3x3CECdoS6xrOMMC0Sovsf3tHLDx EgKX2CXan79nB6mXEJCV2HSAGaLeRWLa9VXsELawxKvjW6BsKYnmjx9YIXqbGSXmbmtmgUhM YJRY2VoKYdtLHLgyB2oZn8S7rz2sEPN5JTrahCBKPCQO7dzPCmE7SvybdJwVEm4dTBLHTk9j msAoNwvJm7MQ3pmF5IUFjMyrGMVSC4pz01OLDQuM9IoTc4tL89L1kvNzNzGCE6aW2Q7GRed8 DjEKcDAq8fBqtPVHCLEmlhVX5h5ilOBgVhLhzfebECHEm5JYWZValB9fVJqTWnyI0RQYqhOZ pUST84HJPK8k3tDEzNDEyMTA3MzCwkRJnHdxo3WEkEB6YklqdmpqQWoRTB8TB6dUA2Pdjfq9 U66dWDn5+/Tk0Oc/k14n5py4y3FcmC+x3W7Jwi+nJ34RP3VlRdqHlb/47pyuvM5UKvY2PPH9 P837ZYfFM0MOaJalJSZcf3E2Pfy02dFYt+lXFGbq8t1jMNGRSiwV33XJ/uO7xnMrz37deIcp VHPR1Aop0Ufqmoun3839+OVb+FmfxC1MSizFGYmGWsxFxYkAwNdwiq4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsWSnRNsqHs0akKEwdY3jBa31p1jtZh/BEgc WXuVyWLmiXZWi/PnN7BbnG16w26x6fE1VovLu+awWfRs2MpqsfbIXXaLZZv+MFks2vqF3aJ1 7xF2i8Nv2lkd+Dw2repk89i8pN6jb8sqRo/Pm+Q8rhxpZA9gjXKzyUhNTEktUkjNS85PycxL t1UKDXHTtVBSyEvMTbVVitD1DQlSUihLzCkF8owM0ICDc4B7sJK+XYJbxuovr5kKOs0rOrv3 MTcwvtXuYuTkkBAwkXi4eR0zhC0mceHeerYuRi4OIYF1jBI3v7WwgCSEBYIlJu3Zxwpiswno SHx7f5oNxBYRUJeYffIOM0gDs8B1JonHe2cwdTFycHAK2Eu86/EEqRES6GaS2HzHBcRmFtCU aN3+mx3EZhFQlbg5/zvYYl4BU4mdLw6ygbTyCghK/N0hDHGPtsS6hjMsEK3yEtvfzmGewMg/ C8mkWQgds5BULWBkXsUollpQnJueW1xgYKhXnJhbXJqXrpecn7uJERiH2w4rie1gbFvhdYhR gINRiYd3wrT+CCHWxLLiytxDjBIczEoivPl+EyKEeFMSK6tSi/Lji0pzUosPMZoCHT6RWUo0 OR+YIvJK4g1NTC0sLEwsjY2NLUyUxHljpz8LFxJITyxJzU5NLUgtgulj4uCUamBkY9l1KFji cnd0/rbATukzjJo9V/fO23pZSuPAywP2V+L+innOmfR2pcTnNsNeji/L3BZrbRXzncPuHppl uvzM5KblUi3pTz/+OnmSV76h9ljwc0t+z7LnLtONp+hYXjVWcvBeu+5julj4Za2b+jNuX/3U dUVPoWJKmvyiJadPz+K0b56/bf1ZJZbijERDLeai4kQAuHk4PNkCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170131093709epcas1p489fa8491abaea431ef8a9c345773ab6a X-Msg-Generator: CA X-Sender-IP: 182.195.34.22 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: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected 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 Wed, 2017-01-18 at 16:10 +0100, Andrzej Hajda wrote: > 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? MFCv10.10 is used in Exynos7880. There are other variants of MFCv10 used in Exynos8890 and Exynos7870. I have no plans to upstream the platform support for this SoC, may be other members of Samsung may take it up. But I will mention the SoCs in the next version. > > > > > - 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? Firmware binary is not available publicly. I will check on sending it 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. I used BIT(5) in case someone upstreams MFCv9 they can use BIT(4) in order to maintain the sequence order as before. Thank you for the review. Regards, Smitha > > Regards > Andrzej > >