From patchwork Mon Mar 20 10:56:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 95504 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp882181qgd; Mon, 20 Mar 2017 04:00:23 -0700 (PDT) X-Received: by 10.84.229.2 with SMTP id b2mr39424197plk.154.1490007623708; Mon, 20 Mar 2017 04:00:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si17052423pgj.392.2017.03.20.04.00.23; Mon, 20 Mar 2017 04:00:23 -0700 (PDT) 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 S1754212AbdCTLAQ (ORCPT + 4 others); Mon, 20 Mar 2017 07:00:16 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:30564 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662AbdCTK5P (ORCPT ); Mon, 20 Mar 2017 06:57:15 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0ON400EHD12SLE20@mailout3.w1.samsung.com>; Mon, 20 Mar 2017 10:56:52 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170320105652eucas1p134f44f606b9c8cfe41d6fde483d69d37~tkdjN9Qih2157021570eucas1p1l; Mon, 20 Mar 2017 10:56:52 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 42.BD.28517.375BFC85; Mon, 20 Mar 2017 10:56:51 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170320105651eucas1p1c80766207bf60d211200f2f5daa2c799~tkdif-Mty0560605606eucas1p1a; Mon, 20 Mar 2017 10:56:51 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-32-58cfb573da95 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 4F.DA.10233.185BFC85; Mon, 20 Mar 2017 10:57:05 +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:51 +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 06/16] media: s5p-mfc: Move setting DMA max segment size to DMA configure function Date: Mon, 20 Mar 2017 11:56:32 +0100 Message-id: <1490007402-30265-7-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+NgFjrEIsWRmVeSWpSXmKPExsWy7djP87rFW89HGCy+YWhxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDmKyyYl NSezLLVI3y6BK+POpo3sBRPEKub8rm1gfCfUxcjJISFgIvF5xwE2CFtM4sK99UA2F4eQwFJG id1TPrJAOJ8ZJbbsfMMO07Hx/kyoqmWMEisbt7BDOA1MEmeaPzGCVLEJGEp0ve0Cmysi4CSx cNZfsCJmge+MEt92n2YFSQgLpEuc7DnODGKzCKhK3PjeB9TAwcEr4CFx90gVxDY5iZPHJoOV cwp4Sry4/hdss4TAczaJD4u7mEDqJQRkJTYdYIaod5H483QH1D/CEq+Ob4G6Wkbi8uRuFgi7 n1GiqVUbwp7BKHHuLS+EbS1x+PhFsF3MAnwSk7ZNZ4YYzyvR0SYEYXpIbN5WDlHtKDFj1gFo AM1hlNjz4RHTBEaZBYwMqxhFUkuLc9NTi030ihNzi0vz0vWS83M3MQJj9vS/4192MC4+ZnWI UYCDUYmH98alcxFCrIllxZW5hxglOJiVRHg/zj0fIcSbklhZlVqUH19UmpNafIhRmoNFSZx3 z4Ir4UIC6YklqdmpqQWpRTBZJg5OqQZG5RoPxceOjzsXNpcHOos7LH9p/6PH5k5Y4Ov3zlwb nTY/dun/U/tw+bS92kKTlii/zZvuxyfOukJG6ovPLm1J/uxtZrzt+9me/312fp2tw7PMfQ21 6nsaf54KiErlsp0ZctQ2nvlj0r8Gz+On8m+dkuswj316WS7M5Kjl/R83/TeeF6+48I9LiaU4 I9FQi7moOBEAC46oddUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsVy+t/xa7qNW89HGOxfbmBxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhl3Nm1kL5ggVjHnd20D4zuhLkZODgkBE4mN92eyQdhiEhfurQeyuTiEBJYwSvx91sgE4TQx SRy8/ZMFpIpNwFCi620XWIeIgJPEwll/2UFsZoHvjBLLbqaB2MIC6RIHdk9gBrFZBFQlbnzv A6rn4OAV8JC4e6QKYpmcxMljk1lBbE4BT4kX1/+CjRQCKln3eSLTBEbeBYwMqxhFUkuLc9Nz i430ihNzi0vz0vWS83M3MQLDd9uxn1t2MHa9Cz7EKMDBqMTDa3D1XIQQa2JZcWXuIUYJDmYl Ed6Pc89HCPGmJFZWpRblxxeV5qQWH2I0BbppIrOUaHI+MLbySuINTQzNLQ2NjC0szI2MlMR5 p364Ei4kkJ5YkpqdmlqQWgTTx8TBKdXAyGa0PqKwadNDw4rfL0oLNH2L/y+6PUkpfqHxpLRH O44uPOA4+9bN2ZzbQjq4tVYck1JaLJy5PVdWkcMj/anztZcar/3lGvjsflRVrT0ruYTFYfa+ Bd8eSt4zk2ZsaDQJPp7Qx39Jfe7auYqi0dwpQQZHhbaZBVe+UTwlNv3WvKRVi4v9ODe/VmIp zkg01GIuKk4EABEVUOF1AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170320105651eucas1p1c80766207bf60d211200f2f5daa2c799 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: 20170320105651eucas1p1c80766207bf60d211200f2f5daa2c799 X-RootMTR: 20170320105651eucas1p1c80766207bf60d211200f2f5daa2c799 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 Setting DMA max segment size to 32 bit mask is a part of DMA memory configuration, so move those calls to s5p_mfc_configure_dma_memory() function. Signed-off-by: Marek Szyprowski Reviewed-by: Javier Martinez Canillas Tested-by: Javier Martinez Canillas Acked-by: Andrzej Hajda Tested-by: Smitha T Murthy --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 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/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index c03ed1a737b7..1fe790d88e70 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1117,9 +1117,13 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) if (exynos_is_iommu_available(dev)) { int ret = exynos_configure_iommu(dev, S5P_MFC_IOMMU_DMA_BASE, S5P_MFC_IOMMU_DMA_SIZE); - if (ret == 0) + if (ret == 0) { mfc_dev->mem_dev[BANK1_CTX] = mfc_dev->mem_dev[BANK2_CTX] = dev; + vb2_dma_contig_set_max_seg_size(dev, + DMA_BIT_MASK(32)); + } + return ret; } @@ -1138,6 +1142,11 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) return -ENODEV; } + vb2_dma_contig_set_max_seg_size(mfc_dev->mem_dev[BANK1_CTX], + DMA_BIT_MASK(32)); + vb2_dma_contig_set_max_seg_size(mfc_dev->mem_dev[BANK2_CTX], + DMA_BIT_MASK(32)); + return 0; } @@ -1147,11 +1156,14 @@ static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev) if (exynos_is_iommu_available(dev)) { exynos_unconfigure_iommu(dev); + vb2_dma_contig_clear_max_seg_size(dev); return; } device_unregister(mfc_dev->mem_dev[BANK1_CTX]); device_unregister(mfc_dev->mem_dev[BANK2_CTX]); + vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK1_CTX]); + vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK2_CTX]); } /* MFC probe function */ @@ -1209,11 +1221,6 @@ static int s5p_mfc_probe(struct platform_device *pdev) goto err_dma; } - vb2_dma_contig_set_max_seg_size(dev->mem_dev[BANK1_CTX], - DMA_BIT_MASK(32)); - vb2_dma_contig_set_max_seg_size(dev->mem_dev[BANK2_CTX], - DMA_BIT_MASK(32)); - mutex_init(&dev->mfc_mutex); init_waitqueue_head(&dev->queue); dev->hw_lock = 0; @@ -1346,8 +1353,6 @@ static int s5p_mfc_remove(struct platform_device *pdev) v4l2_device_unregister(&dev->v4l2_dev); s5p_mfc_release_firmware(dev); s5p_mfc_unconfigure_dma_memory(dev); - vb2_dma_contig_clear_max_seg_size(dev->mem_dev[BANK1_CTX]); - vb2_dma_contig_clear_max_seg_size(dev->mem_dev[BANK2_CTX]); s5p_mfc_final_pm(dev); return 0;