| Message ID | 1410868485-4143-4-git-send-email-m.szyprowski@samsung.com |
|---|---|
| State | Superseded |
| Headers | show
Return-Path: <patchwork-forward+bncBDG6PF6SSYDRBHGK4CQAKGQENYZVAVY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 953582057E for <linaro@patches.linaro.org>; Tue, 16 Sep 2014 11:55:09 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e53sf3164599eek.2 for <linaro@patches.linaro.org>; Tue, 16 Sep 2014 04:55:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=lCq2/FTAiso7S8TxlbaCM3olQ6RBOHK0JkA9Ua4plcc=; b=S3IUv2K4RdqX1tCsgNLEAzzX6CiGjRsqFKTbIhaCxkGJCbzvA7+7krCDGU5Nghsis7 QUpaD1g9Uo7TohZ4jQ+tJNDgYFGlhjCF6Re5+M4k9/RxZfle1Oy/sDWbB9y9KtUjS4uS xXwrT0i+NVWB2k2QffW3EjjOaMDuVwiKHAtBNpY3nvltRqgR1uJpQeAY3HT2DujE74Ro 1XtiyZan6mzMGKnmXV8xFX2BDIGbRmrUcJl7kEwyAbKX5WcwC6HnMs7bR8eDZ+9xkp2l fChCfivCjUbwZx1eVnVIFjGl3dUlR95NUOmMQvL27fB58jfIqQr34Y50kiC+4Y8U4KYq HzGQ== X-Gm-Message-State: ALoCoQkA+ZS4SSw2tzoEE8DiMHzmd6UOJISIXkqb871GXc7p2t9I6NQI/tfqaOcLAUsfcDZ6rkUl X-Received: by 10.180.24.225 with SMTP id x1mr409708wif.2.1410868508471; Tue, 16 Sep 2014 04:55:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.227 with SMTP id z3ls458710lad.44.gmail; Tue, 16 Sep 2014 04:55:08 -0700 (PDT) X-Received: by 10.152.26.133 with SMTP id l5mr36921432lag.4.1410868508030; Tue, 16 Sep 2014 04:55:08 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) by mx.google.com with ESMTPS id jf6si23881086lac.14.2014.09.16.04.55.07 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 04:55:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id n15so2707391lbi.20 for <patchwork-forward@linaro.org>; Tue, 16 Sep 2014 04:55:07 -0700 (PDT) X-Received: by 10.152.22.137 with SMTP id d9mr36263640laf.29.1410868506867; Tue, 16 Sep 2014 04:55:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp374264lbb; Tue, 16 Sep 2014 04:55:06 -0700 (PDT) X-Received: by 10.66.145.133 with SMTP id su5mr49475736pab.11.1410868505376; Tue, 16 Sep 2014 04:55:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dw7si13274669pab.96.2014.09.16.04.55.04 for <multiple recipients>; Tue, 16 Sep 2014 04:55:05 -0700 (PDT) Received-SPF: none (google.com: linux-samsung-soc-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754328AbaIPLzB (ORCPT <rfc822;tyler.baker@linaro.org> + 6 others); Tue, 16 Sep 2014 07:55:01 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:62696 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754319AbaIPLy7 (ORCPT <rfc822;linux-samsung-soc@vger.kernel.org>); Tue, 16 Sep 2014 07:54:59 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NBZ00C61T87Z1B0@mailout4.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 16 Sep 2014 12:57:43 +0100 (BST) X-AuditID: cbfec7f5-b7f776d000003e54-d9-5418250e1270 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 85.8C.15956.E0528145; Tue, 16 Sep 2014 12:54:55 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NBZ00CMIT3CL960@eusync2.samsung.com>; Tue, 16 Sep 2014 12:54:54 +0100 (BST) From: Marek Szyprowski <m.szyprowski@samsung.com> To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski <m.szyprowski@samsung.com>, linaro-mm-sig@lists.linaro.org, Arnd Bergmann <arnd@arndb.de>, Shaik Ameer Basha <shaik.ameer@samsung.com>, Cho KyongHo <pullip.cho@samsung.com>, Joerg Roedel <joro@8bytes.org>, Thierry Reding <treding@nvidia.com>, Olof Johansson <olof@lixom.net>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Rob Herring <robh@kernel.org>, Will Deacon <will.deacon@arm.com>, David Wodhouse <dwmw2@infradead.org>, Inki Dae <inki.dae@samsung.com>, Kukjin Kim <kgene.kim@samsung.com>, Tomasz Figa <tomasz.figa@gmail.com>, Kyungmin Park <kyungmin.park@samsung.com> Subject: [PATCH v2 03/18] drm: exynos: detach from default dma-mapping domain on init Date: Tue, 16 Sep 2014 13:54:30 +0200 Message-id: <1410868485-4143-4-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1410868485-4143-1-git-send-email-m.szyprowski@samsung.com> References: <1410868485-4143-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t/xK7r8qhIhBjtPsFv8nXSM3WLiysnM FpPuT2CxWLDf2qJz9gZ2i94FV9kszja9YbfonLiE3eLLlYdMFpseX2O1mHF+H5PF2iN32S1O Xf/MZvGv9yCjxf89O9gtjjzczW6xatcfRovbv/ksXn48weIg7PHk4DwmjzXz1jB6/P41idFj 56y77B6zO2ayemxeoeWxaVUnm8fmJfUet/89ZvaYfGM5o8eVE02sHr3N79g8+rasYvT4vEku gC+KyyYlNSezLLVI3y6BK+P29aCC+2wVF2a3MjUwvmLtYuTkkBAwkdjzYhkThC0mceHeerYu Ri4OIYGljBL3V85mhnD6mCT2bd3LDlLFJmAo0fW2iw3EFhHIl3ix9y8LiM0s8IZF4t4mQxBb WCBcou/uKWYQm0VAVeLGn+1A2zg4eAXcJRr/sUAsk5P4/3IF2GJOAQ+JyW1PwMqFgEo+fjvF NIGRdwEjwypG0dTS5ILipPRcI73ixNzi0rx0veT83E2MkOj4uoNx6TGrQ4wCHIxKPLwZ/8RD hFgTy4orcw8xSnAwK4nwaihKhAjxpiRWVqUW5ccXleakFh9iZOLglGpgnGKw+EFIpkl9/w7N rn3WS1o+8M8rUL9YobrHuPXVmkNWu5of2R8+bH/txLIqpXW/9F9/jM19FrHwGQvHzae7J3w4 NEVk+VpZ9oRXhWcS+VP5D99Ki/2e/uaRdOv0S9cShaweHu2M+3/5pvbb1Lt/dx9WuTbl5fxj JRdPvJqksuGX1qVrR39mmIkosRRnJBpqMRcVJwIA4zfQvGwCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c index b32b291f88ff..323601a52a25 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -100,6 +100,9 @@ int drm_iommu_attach_device(struct drm_device *drm_dev, dma_set_max_seg_size(subdrv_dev, 0xffffffffu); + if (subdrv_dev->archdata.mapping) + arm_iommu_detach_device(subdrv_dev); + ret = arm_iommu_attach_device(subdrv_dev, dev->archdata.mapping); if (ret < 0) { DRM_DEBUG_KMS("failed iommu attach.\n");
This patch adds code, which detach sub-device nodes from default iommu domain if such has been configured. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_iommu.c | 3 +++ 1 file changed, 3 insertions(+)