Message ID | 1490601872-17369-1-git-send-email-m.szyprowski@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces@lists.freedesktop.org> 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 E35E460328 for <patchwork-dri-devel@patchwork.kernel.org>; Mon, 27 Mar 2017 08:04:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5F752815E for <patchwork-dri-devel@patchwork.kernel.org>; Mon, 27 Mar 2017 08:04:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CABFC2832F; Mon, 27 Mar 2017 08:04:47 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 144602815E for <patchwork-dri-devel@patchwork.kernel.org>; Mon, 27 Mar 2017 08:04:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BA9A6E17B; Mon, 27 Mar 2017 08:04:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FE576E17B for <dri-devel@lists.freedesktop.org>; Mon, 27 Mar 2017 08:04:43 +0000 (UTC) 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 <0ONG003UCRRRP680@mailout2.w1.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 27 Mar 2017 09:04:39 +0100 (BST) Received: from eusmges5.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170327080439eucas1p1af2a7398ff1505af8051f65451934fe3~vroL3FgTR1220412204eucas1p1w; Mon, 27 Mar 2017 08:04:39 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges5.samsung.com (EUCPMTA) with SMTP id C9.8C.25577.697C8D85; Mon, 27 Mar 2017 09:04:38 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170327080438eucas1p28a1a20c1bfeafc037fe26d94639044a9~vroLNJsU40860008600eucas1p2S; Mon, 27 Mar 2017 08:04:38 +0000 (GMT) X-AuditID: cbfec7f5-f792f6d0000063e9-4b-58d8c79627b5 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id A6.B8.20206.7A7C8D85; Mon, 27 Mar 2017 09:04:55 +0100 (BST) 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 <0ONG00FT4RRM3N00@eusync1.samsung.com>; Mon, 27 Mar 2017 09:04:38 +0100 (BST) From: Marek Szyprowski <m.szyprowski@samsung.com> To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH] drm/exynos: Properly release default ARM DMA-IOMMU mapping Date: Mon, 27 Mar 2017 10:04:32 +0200 Message-id: <1490601872-17369-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsWy7djP87rTjt+IMDjwwcLi1rpzrBYbZ6xn tbjy9T2bxaT7E1gsXty7yGJx/vwGdosZ5/cxWaw9chfImvySzYHTY9OqTjaP+93HmTz6tqxi 9Pi8SS6AJYrLJiU1J7MstUjfLoErY9GfXSwFe7kq1j6Zx9jA+I+ji5GTQ0LAROL2h5MsELaY xIV769m6GLk4hASWMkr8X3SIGSQhJPCZUeLBCQmYhvv3rzNDFC1jlLi7+B0jhNPAJDFz2k5G kCo2AUOJrrddbCC2iICbRNPhmawgRcwCa5gk3u9byASSEBbwlug/8wpsBYuAqsSEzgfsIDav gIfE6zlfWCHWyUmcPDYZyr7PJnH4GVAvB5AtK7HpADNE2EVi1/ajTBC2sMSr41vYIWwZicuT u6Fe62eUaGrVhrBnMEqce8sLYVtLHD5+EWw8swCfxKRt05khxvNKdLQJQZgeEqu/cENUO0rc 3PqFCRImsRLvNnxnncAovYCRYRWjSGppcW56arGpXnFibnFpXrpecn7uJkZgtJ7+d/zrDsal x6wOMQpwMCrx8GZI34gQYk0sK67MPcQowcGsJMJ7cD9QiDclsbIqtSg/vqg0J7X4EKM0B4uS OC/XqWsRQgLpiSWp2ampBalFMFkmDk6pBkZTyzKhzx9MZq2TezTx4ocnfFP2TJeYcIktSbP2 lvJjndAmG51rB5Yw3Nwn+XX5eqWLx/Mu3sjet8aIIaPTs6Pxod6JIMmj8vsuHpqatGe61+sb /EmHLLzVnN7Fmp4zCOMuc605PrnM+m2js+C1/oiSnZOnf6me+HreF/8M7gWKnMf0Ot94fOdS YinOSDTUYi4qTgQAgoMNStICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRmVeSWpSXmKPExsVy+t/xy7rLj9+IMFhwlNPi1rpzrBYbZ6xn tbjy9T2bxaT7E1gsXty7yGJx/vwGdosZ5/cxWaw9chfImvySzYHTY9OqTjaP+93HmTz6tqxi 9Pi8SS6AJcrNJiM1MSW1SCE1Lzk/JTMv3VYpNMRN10JJIS8xN9VWKULXNyRISaEsMacUyDMy QAMOzgHuwUr6dgluGYv+7GIp2MtVsfbJPMYGxn8cXYycHBICJhL3719nhrDFJC7cW8/WxcjF ISSwhFFiV89ZZginiUni8Iz1YFVsAoYSXW+72EBsEQE3iabDM1lBipgF1jBJtLZ/ZgdJCAt4 S/SfeQXWwCKgKjGh8wFYnFfAQ+L1nC+sEOvkJE4em8w6gZF7ASPDKkaR1NLi3PTcYiO94sTc 4tK8dL3k/NxNjMBA3Xbs55YdjF3vgg8xCnAwKvHw7hC7ESHEmlhWXJl7iFGCg1lJhPfgfqAQ b0piZVVqUX58UWlOavEhRlOg5ROZpUST84FRlFcSb2hiaG5paGRsYWFuZKQkzjv1w5VwIYH0 xJLU7NTUgtQimD4mDk6pBsbmG18Suu8l7ik7Xi0rdIRhvsHylOfaHw6em8f0OWHjZZ6mh0Fv dWdxqnJoScyIzO8pOD7bvas4b316R/DrFZNmXpl+yt/xnbvlw5xWVYlfXjvvJrNcanRLWNhx XlCs/drlOsbvF75+MXWY8DRG4qxIE5v2n9zr+VxfWpRaHL09k/fWsv6b0qXEUpyRaKjFXFSc CABT7NLFagIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170327080438eucas1p28a1a20c1bfeafc037fe26d94639044a9 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: 20170327080438eucas1p28a1a20c1bfeafc037fe26d94639044a9 X-RootMTR: 20170327080438eucas1p28a1a20c1bfeafc037fe26d94639044a9 References: <CGME20170327080438eucas1p28a1a20c1bfeafc037fe26d94639044a9@eucas1p2.samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Seung-Woo Kim <sw0312.kim@samsung.com>, Krzysztof Kozlowski <krzk@kernel.org>, Marek Szyprowski <m.szyprowski@samsung.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.h b/drivers/gpu/drm/exynos/exynos_drm_iommu.h index 87f6b5672e11..7a4528461bba 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.h +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.h @@ -37,8 +37,13 @@ static inline int __exynos_iommu_create_mapping(struct exynos_drm_private *priv, static inline int __exynos_iommu_attach(struct exynos_drm_private *priv, struct device *dev) { - if (dev->archdata.mapping) + struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev); + + /* release device from the default DMA-IOMMU mapping */ + if (mapping) { arm_iommu_detach_device(dev); + arm_iommu_release_mapping(mapping); + } return arm_iommu_attach_device(dev, priv->mapping); }
Exynos DRM on ARM architecture creates its own DMA-IOMMU mapping, shared between all devices that builds the Exynos DRM subsystem. Thus, the default DMA-IOMMU mapping structure created by platform init code can be released to avoid leaking resources, because after exynos_iommu_attach() the default mapping is no longer accessible. Reported-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_iommu.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)