From patchwork Thu Nov 13 09:32:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5294911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9552DC11AC for ; Thu, 13 Nov 2014 09:51:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B04E9201EF for ; Thu, 13 Nov 2014 09:51:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD9B52011E for ; Thu, 13 Nov 2014 09:51:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xor2N-00024d-6F; Thu, 13 Nov 2014 09:49:59 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xor1L-0001Oq-SR for linux-arm-kernel@bombadil.infradead.org; Thu, 13 Nov 2014 09:48:56 +0000 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoqmE-00041p-R4 for linux-arm-kernel@lists.infradead.org; Thu, 13 Nov 2014 09:33:20 +0000 Received: by mail-wi0-f177.google.com with SMTP id l15so3671898wiw.10 for ; Thu, 13 Nov 2014 01:32:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7CeZPkoCM2LsDiBoYaKN+I5rtyq9CVtbhP8Ekdm6KBU=; b=mhl9VaIkhFfbABHQbuDOAK/jGaxaU7qpxOyCaZj9WKl6CKfL1Id7w2SoMh6wttVW0B KgZnFQSepIT0af5XBYIZsTlUFW9uH8Gbfrwx5nSUnsAh/IQ4ZIYGm9GBKDp0nxcH2gBZ zoUx2XOF0lLYFwsuwgroZgazsqsZp4+qBGR6p/fmn7DNPHh//WRXLihV5tWUPaWIHJM3 xBu3nsCUuv5WMdO3sjVuDKCZFvq+FsrdYHg2n5/19uVdSPxRA4IfaTYZrGyayUN1xkcz A8NNVClnGxCywPQ/exZLesgl96eoT3eBhgfnl05Vw74QPeXtDR37Z9MSoby0r7U8oYqh iXUA== X-Received: by 10.194.171.201 with SMTP id aw9mr1980170wjc.67.1415871177541; Thu, 13 Nov 2014 01:32:57 -0800 (PST) Received: from localhost (port-8254.pppoe.wtnet.de. [84.46.32.94]) by mx.google.com with ESMTPSA id ga1sm4905392wib.1.2014.11.13.01.32.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Nov 2014 01:32:56 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH v7 09/12] ARM: tegra: Enable IOMMU for display controllers on Tegra30 Date: Thu, 13 Nov 2014 10:32:34 +0100 Message-Id: <1415871157-21968-10-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1415871157-21968-1-git-send-email-thierry.reding@gmail.com> References: <1415871157-21968-1-git-send-email-thierry.reding@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141113_093318_936213_5EB1C5DE X-CRM114-Status: GOOD ( 11.45 ) X-Spam-Score: -2.7 (--) Cc: Alexandre Courbot , Russell King , Stephen Warren , Catalin Marinas , Joerg Roedel , Will Deacon , linux-tegra@vger.kernel.org, iommu@lists.linux-foundation.org, Olof Johansson , Mike Turquette , David Riley , Peter De Schrijver , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Thierry Reding Add iommus properties to the device tree nodes for the two display controllers found on Tegra30. This will allow the display controllers to map physically non-contiguous buffers to I/O virtual contiguous address spaces so that they can be used for scan-out. Signed-off-by: Thierry Reding --- arch/arm/boot/dts/tegra30.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 0d20058afe9d..99475f6e76a3 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -166,6 +167,8 @@ resets = <&tegra_car 27>; reset-names = "dc"; + iommus = <&mc TEGRA_SWGROUP_DC>; + nvidia,head = <0>; rgb { @@ -183,6 +186,8 @@ resets = <&tegra_car 26>; reset-names = "dc"; + iommus = <&mc TEGRA_SWGROUP_DCB>; + nvidia,head = <1>; rgb {