From patchwork Mon Feb 20 13:39:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 94218 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1327188qgi; Mon, 20 Feb 2017 05:39:58 -0800 (PST) X-Received: by 10.98.88.133 with SMTP id m127mr26253477pfb.155.1487597998880; Mon, 20 Feb 2017 05:39:58 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d2si18592166pge.343.2017.02.20.05.39.58; Mon, 20 Feb 2017 05:39:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753257AbdBTNjz (ORCPT + 4 others); Mon, 20 Feb 2017 08:39:55 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:21520 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752520AbdBTNjU (ORCPT ); Mon, 20 Feb 2017 08:39:20 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OLO00755DXIG950@mailout2.w1.samsung.com>; Mon, 20 Feb 2017 13:39:18 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170220133918eucas1p108ac054d17050ad259433a3872fec8db~lAnYXi5x40282402824eucas1p1S; Mon, 20 Feb 2017 13:39:18 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 8D.12.28517.581FAA85; Mon, 20 Feb 2017 13:39:17 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170220133917eucas1p2f141e73392ee36596410ce308360a5d7~lAnXjnOoJ0833608336eucas1p20; Mon, 20 Feb 2017 13:39:17 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-84-58aaf185449e Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 7C.FA.10233.A81FAA85; Mon, 20 Feb 2017 13:39:22 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OLO00HBFDX6PK30@eusync1.samsung.com>; Mon, 20 Feb 2017 13:39:16 +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 v2 14/15] media: s5p-mfc: Use preallocated block allocator always for MFC v6+ Date: Mon, 20 Feb 2017 14:39:03 +0100 Message-id: <1487597944-2000-15-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1487597944-2000-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWRb0gTcRjH/e1ut9twdZxiD2ZGA0GSloIvVopUFi3wRb1yBDkPPablVHbO MjFEMnVF6hZNTckQ/3SgyVxqJUtn3YjZlhoJVvYiqDTFRFG0lHZdvvs8f77f5/vjR2L0GB5N 5heWsJZCpkBDqPBBYTN4pHqFNyS2jMbrZvsCcp39SwOuCwb7Fbo7/U/luqagR6brffVZoRtf rAmVjnniBKl38XWE/q6bR/pVV+x57KIqNZctyC9lLUfTslV5Hu86UbwVc23yWydRiQJgQyQJ VDJseI/ZkDKEUfBu7glhQyqSpjoRjP4WZFKxiqCjZxztCnZqD0n9LgRD9buKShkM+P0K0Yqg ksC2ZCNEjqROwaOWbYW4hFEbCNZf+OXiIIIyQlfvIhIZp+JACA5hIqspPfC2h4SUKRbeCA65 eFkZ6g/X5Ig+QC0TMNXzA5cSHQDXKCbhaXCvWCVlBCz43AqJY2DacRuXuB5BVXWCxE0IAktq iVNg3Df5LxlG7QH7oPO/pRpqb9HSih56BnwyiU9Cs/ceLj39AYKJtQBqQDHtKIxHkayVM5tY LlnLMWbOWmjS5hSZXSj0sf4d39ow6hCOexFFIk24Or75sYGWM6VcmdmLgMQ0kerped5Aq3OZ suuspchosRawnBftJ3HNPvVI+/tMmjIxJewVli1mLbtTGamMrkT0Wb618dLPqVxWmXrwAu3c O3LGkOos9xBzE5qUKPfNnD5LRcmzD63mYZTVVqptYheyu+0Zmwv3y+Mc57YTvrNZYQOqP5nb yvDuipc3TJe1s22eBHNzlOxXxUz31/SNty1DV9PKEpc/GjOErrqxGWG1scppf01t0eke4/Ot Txqcy2OSDmMWjvkL7kS4xdQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsVy+t/xy7pdH1dFGJzaoWNxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhn7Dn1jK/glU3Hx2VK2BsZzEl2MHBwSAiYS/zoUuxg5gUwxiQv31rN1MXJxCAksYZRoPP6T GcJpYpJ4v/AqC0gVm4ChRNfbLjYQW0TASWLhrL/sIDazwHdGiWU300BsYYF4iWVr3zCC2CwC qhLHzm9nBrF5BTwkVnXNZ4PYJidx8thkVpAjOIHiO9qTQcJCAu4SX571Mk1g5F3AyLCKUSS1 tDg3PbfYSK84Mbe4NC9dLzk/dxMjMHy3Hfu5ZQdj17vgQ4wCHIxKPLwaM1dGCLEmlhVX5h5i lOBgVhLhvfxyVYQQb0piZVVqUX58UWlOavEhRlOgmyYyS4km5wNjK68k3tDE0NzS0MjYwsLc yEhJnHfqhyvhQgLpiSWp2ampBalFMH1MHJxSDYwzlkpd/Knm2+NuGHHjLfPXjNXNE0+YLp4a c2ihw/VQ821XePWz7QQOujz6e4e312Z7XbbCjocLjfY62EcwMVbqTD+UwCt/W4P9rbzjylXf +ROnSmpHls54/05bfvV/98+NhySirudIz0qaF3+z86RUTc5t9j3Hsrb2/20M/ZqdWnRo8atd WSeUWIozEg21mIuKEwH9bWEndQIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170220133917eucas1p2f141e73392ee36596410ce308360a5d7 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170220133917eucas1p2f141e73392ee36596410ce308360a5d7 X-RootMTR: 20170220133917eucas1p2f141e73392ee36596410ce308360a5d7 References: <1487597944-2000-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 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 --- Documentation/devicetree/bindings/media/s5p-mfc.txt | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 b70cbd637851..b4a13e4cc9d4 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1182,9 +1182,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); @@ -1244,7 +1247,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); @@ -1255,7 +1258,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);