From patchwork Mon Mar 20 10:56:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9633729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C5C2160327 for ; Mon, 20 Mar 2017 10:59:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B882B27F85 for ; Mon, 20 Mar 2017 10:59:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD31D27F94; Mon, 20 Mar 2017 10:59:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A775227FBB for ; Mon, 20 Mar 2017 10:59:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753688AbdCTK66 (ORCPT ); Mon, 20 Mar 2017 06:58:58 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:32748 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753668AbdCTK5Q (ORCPT ); Mon, 20 Mar 2017 06:57:16 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0ON400AN612V4P20@mailout4.w1.samsung.com>; Mon, 20 Mar 2017 10:56:55 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170320105655eucas1p1a9da05459fd17f11801228ee8f50bf3e~tkdmPfyEI2157521575eucas1p1v; Mon, 20 Mar 2017 10:56:55 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 69.FF.09557.775BFC85; Mon, 20 Mar 2017 10:56:55 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170320105654eucas1p13c5d9a82f7410c53e427340b8a572f96~tkdlk0dSw1770317703eucas1p1g; Mon, 20 Mar 2017 10:56:54 +0000 (GMT) X-AuditID: cbfec7f2-f790f6d000002555-83-58cfb57732a8 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id F1.EA.10233.585BFC85; Mon, 20 Mar 2017 10:57:09 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ON4005OP12KYT20@eusync4.samsung.com>; Mon, 20 Mar 2017 10:56:54 +0000 (GMT) From: Marek Szyprowski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Andrzej Hajda , Krzysztof Kozlowski , Inki Dae , Seung-Woo Kim Subject: [PATCH v3 14/16] media: s5p-mfc: Use preallocated block allocator always for MFC v6+ Date: Mon, 20 Mar 2017 11:56:40 +0100 Message-id: <1490007402-30265-15-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1490007402-30265-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRmVeSWpSXmKPExsWy7djPc7rlW89HGLyazmJxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDmKyyYl NSezLLVI3y6BK6PhYDNrwR3Zirf7xBsYl0p2MXJwSAiYSJzYX9HFyAlkiklcuLeerYuRi0NI YCmjxOvdF6Ccz4wSe6/dZoKoMpHYsW09E0RiGaPEqwszoZwGJomjp1ezgVSxCRhKdL3tArNF BJwkFs76yw5SxCzwnVHi2+7TrCAJYYF4ifULb4MVsQioSjTs3QAW5xXwlPhwZzorxDo5iZPH JoPZnEDxF9f/gt0kIfCcTeLrnWfMEE/ISmw6wAxR7yKx+vQ0qFOFJV4d38IOYctIXJ7czQJh 9zNKNLVqQ9gzGCXOveWFsK0lDh+/CLaLWYBPYtK26VDjeSU62oQgSjwkvi+dDzXSUWLdo2Z2 iOfnMErs3/KXZQKjzAJGhlWMIqmlxbnpqcXGesWJucWleel6yfm5mxiBUXv63/FPOxi/nrA6 xCjAwajEw3vj0rkIIdbEsuLK3EOMEhzMSiK8H+eejxDiTUmsrEotyo8vKs1JLT7EKM3BoiTO u2fBlXAhgfTEktTs1NSC1CKYLBMHp1QDY23bF4f5qoy+C+s10wSfxi3VPiBUu1xk3paTGSb8 mxIWSxgv32p7WKMhgtlt7fqVmY9X/6xWkmk8JvtW4GKGx68dGzj23M97slSNuzonIJtjs8K5 qqbpMRduRkVNPr1+yUbmX9a3Q+7x2CQwObpOf11zO/jn/HvHDTm2cSyZFi0cwOpbztoZrcRS nJFoqMVcVJwIAH3aYNvWAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsVy+t/xa7qtW89HGGw6zWpxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhkNB5tZC+7IVrzdJ97AuFSyi5GTQ0LARGLHtvVMELaYxIV769m6GLk4hASWMEpsvtzFCuE0 MUm0vvvJDFLFJmAo0fW2iw3EFhFwklg46y87iM0s8J1RYtnNNBBbWCBeYv3C22A1LAKqEg17 N7CC2LwCnhIf7kxnhdgmJ3Hy2GQwmxMo/uL6X7B6IQEPiXWfJzJNYORdwMiwilEktbQ4Nz23 2EivODG3uDQvXS85P3cTIzCAtx37uWUHY9e74EOMAhyMSjy8BlfPRQixJpYVV+YeYpTgYFYS 4f0493yEEG9KYmVValF+fFFpTmrxIUZToKMmMkuJJucDoyuvJN7QxNDc0tDI2MLC3MhISZx3 6ocr4UIC6YklqdmpqQWpRTB9TBycUg2Msl+UbvSkzVjfLnfpw3YemzoxW7aimocTpU2n6r9n YpxfZb9C2tpB99T61jVMYdrqi2YymbYeUpq1KNfJyShD8+Qdzt+P9R+9Ulq+SPtKddrsMzbe N1jyV/AeWSm66mTrFbcV8+7eXu9436li078PaSevTfk68b74Tf95DCy2f7dpe8w1PX4pQoml OCPRUIu5qDgRAEE+yuB2AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170320105654eucas1p13c5d9a82f7410c53e427340b8a572f96 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170320105654eucas1p13c5d9a82f7410c53e427340b8a572f96 X-RootMTR: 20170320105654eucas1p13c5d9a82f7410c53e427340b8a572f96 References: <1490007402-30265-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It turned out that all versions of MFC v6+ hardware doesn't have a strict requirement for ALL buffers to be allocated on higher addresses than the firmware base like it was documented for MFC v5. This requirement is true only for the device and per-context buffers. All video data buffers can be allocated anywhere for all MFC v6+ versions. Basing on this fact, the special DMA configuration based on two reserved memory regions is not really needed for MFC v6+ devices, because the memory requirements for the firmware, device and per-context buffers can be fulfilled by the simple probe-time pre-allocated block allocator instroduced in previous patch. This patch enables support for such pre-allocated block based allocator always for MFC v6+ devices. Due to the limitations of the memory management subsystem the largest supported size of the pre-allocated buffer when no CMA (Contiguous Memory Allocator) is enabled is 4MiB. This patch also removes the requirement to provide two reserved memory regions for MFC v6+ devices in device tree. Now the driver is fully functional without them. Signed-off-by: Marek Szyprowski Reviewed-by: Javier Martinez Canillas Tested-by: Javier Martinez Canillas Acked-by: Andrzej Hajda Tested-by: Smitha T Murthy --- Documentation/devicetree/bindings/media/s5p-mfc.txt | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt index 2c901286d818..d3404b5d4d17 100644 --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt @@ -28,7 +28,7 @@ Optional properties: - memory-region : from reserved memory binding: phandles to two reserved memory regions, first is for "left" mfc memory bus interfaces, second if for the "right" mfc memory bus, used when no SYSMMU - support is available + support is available; used only by MFC v5 present in Exynos4 SoCs Obsolete properties: - samsung,mfc-r, samsung,mfc-l : support removed, please use memory-region diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index f1528054a713..a56031c3263e 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1177,9 +1177,12 @@ static void s5p_mfc_unconfigure_2port_memory(struct s5p_mfc_dev *mfc_dev) static int s5p_mfc_configure_common_memory(struct s5p_mfc_dev *mfc_dev) { struct device *dev = &mfc_dev->plat_dev->dev; - unsigned long mem_size = SZ_8M; + unsigned long mem_size = SZ_4M; unsigned int bitmap_size; + if (IS_ENABLED(CONFIG_DMA_CMA) || exynos_is_iommu_available(dev)) + mem_size = SZ_8M; + if (mfc_mem_size) mem_size = memparse(mfc_mem_size, NULL); @@ -1239,7 +1242,7 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) { struct device *dev = &mfc_dev->plat_dev->dev; - if (exynos_is_iommu_available(dev)) + if (exynos_is_iommu_available(dev) || !IS_TWOPORT(mfc_dev)) return s5p_mfc_configure_common_memory(mfc_dev); else return s5p_mfc_configure_2port_memory(mfc_dev); @@ -1250,7 +1253,7 @@ static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev) struct device *dev = &mfc_dev->plat_dev->dev; s5p_mfc_release_firmware(mfc_dev); - if (exynos_is_iommu_available(dev)) + if (exynos_is_iommu_available(dev) || !IS_TWOPORT(mfc_dev)) s5p_mfc_unconfigure_common_memory(mfc_dev); else s5p_mfc_unconfigure_2port_memory(mfc_dev);