From patchwork Fri Oct 2 00:30:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 7312241 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8CE0A9F314 for ; Fri, 2 Oct 2015 00:30:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEBBB204D8 for ; Fri, 2 Oct 2015 00:30:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E48E620494 for ; Fri, 2 Oct 2015 00:30:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 50EB46ED62; Thu, 1 Oct 2015 17:30:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTPS id 78F136E5B6 for ; Thu, 1 Oct 2015 17:30:41 -0700 (PDT) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NVK01FYBHF26650@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 02 Oct 2015 09:30:38 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.115]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 2F.E6.05274.E20DD065; Fri, 2 Oct 2015 09:30:38 +0900 (KST) X-AuditID: cbfee68d-f79ae6d00000149a-62-560dd02eeec1 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id D1.72.18629.E20DD065; Fri, 2 Oct 2015 09:30:38 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NVK00K2QHF2HX30@mmp1.samsung.com>; Fri, 02 Oct 2015 09:30:38 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: fix to detach device of iommu Date: Fri, 02 Oct 2015 09:30:38 +0900 Message-id: <1443745838-774-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRsSkWFfvAm+YQctkDYsrX9+zWUy6P4HF 4sW9iywWa4/cZbdYsPERo8WMyS/ZHNg87ncfZ/Lo27KK0ePzJrkA5igum5TUnMyy1CJ9uwSu jEsfp7MXzOSs6Jrp08DYyNHFyMkhIWAicXHpNCYIW0ziwr31bCC2kMAKRonzB8Rgah7e+ARU wwUUX8oose/cEUYI5wejxOoru9hBqtgE9CTubDsONklEQFni78RVQEUcHMwCtRJ/OjhATGEB K4lDZxxBTBYBVYnmj3EgxbwCrhL/z29jhVglJ3Hy2GRWkOkSAq/ZJJ4cPs8IkmAREJD4NvkQ C0ivhICsxKYDzBD1khIHV9xgmcAouICRYRWjaGpBckFxUnqRoV5xYm5xaV66XnJ+7iZGYECe /vesdwfj7QPWhxgFOBiVeHgjTvOGCbEmlhVX5h5iNAXaMJFZSjQ5Hxj2eSXxhsZmRhamJqbG RuaWZkrivIpSP4OFBNITS1KzU1MLUovii0pzUosPMTJxcEo1MC53ebDsufT6M/f/n3kSsqpw rULgvDV3nC/NjNXzmfDt27HZfxj+vFM+VbfNZg771x07v20w6JUOql4YYNz/0eefwy0Zi/AV 069KvH+bvc7rxZIzi0+LMDFUfbm4NMc28ceR7UKvf7gGie/+v7ClIzRuccmHVVpztk8Js1Xe /Wn7rFomm8OL3/UYKbEUZyQaajEXFScCAAv+qElDAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRmVeSWpSXmKPExsVy+t9jAV29C7xhButWKltc+fqezWLS/Qks Fi/uXWSxWHvkLrvFgo2PGC1mTH7J5sDmcb/7OJNH35ZVjB6fN8kFMEc1MNpkpCampBYppOYl 56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAC1WUihLzCkFCgUkFhcr6dth mhAa4qZrAdMYoesbEgTXY2SABhLWMGZc+jidvWAmZ0XXTJ8GxkaOLkZODgkBE4mHNz4xQdhi EhfurWfrYuTiEBJYyiix79wRRgjnB6PE6iu72EGq2AT0JO5sOw7WISKgLPF34iqgIg4OZoFa iT8dHCCmsICVxKEzjiAmi4CqRPPHOJBiXgFXif/nt7FCrJKTOHlsMusERu4FjAyrGCVSC5IL ipPSc43yUsv1ihNzi0vz0vWS83M3MYLD/pn0DsbDu9wPMQpwMCrx8Eac5g0TYk0sK67MPcQo wcGsJMK7ez9QiDclsbIqtSg/vqg0J7X4EKMp0P6JzFKiyfnAmMwriTc0NjEzsjQyN7QwMjZX Eue9cYghTEggPbEkNTs1tSC1CKaPiYNTqoEx7McppcXT5F7F95tEHO6wWD5dd7JpTdDpzFUW ifUtHP4BZ5ty0nqDjs6brv+Dt3LK5G2Pv3PMXxTJt/iMe1idd2ThzO4O6RsmMb+2OV5axvvo KF9D6PGDWrkGi0WmfNWekLgvfFWs/P3nwr0vb3h9+G22+DrDgvATqVpr4viidT+ssGle90BH iaU4I9FQi7moOBEANtGn5ZECAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com, stable@vger.kernel.org, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The arm_iommu_detach_device() is a function to detach device of iommu attached by arm_iommu_attach_device(). The exynos-drm uses arm_iommu_attach_device() so it should use arm_iommu_detach_device() to detach device of iommu, not iommu_detach_device(). The drm_release_iommu_mapping() is a function to release mapping of iommu created by arm_iommu_create_mapping(). It is called by exynos_drm_unload() so shouldn't be called by drm_iommu_detach_device(). Signed-off-by: Joonyoung Shim Cc: # v3.8+ --- drivers/gpu/drm/exynos/exynos_drm_iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c index 055e8ec..d73b9ad 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -139,6 +139,5 @@ void drm_iommu_detach_device(struct drm_device *drm_dev, if (!mapping || !mapping->domain) return; - iommu_detach_device(mapping->domain, subdrv_dev); - drm_release_iommu_mapping(drm_dev); + arm_iommu_detach_device(subdrv_dev); }