From patchwork Fri Nov 7 16:01:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 408187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D66DB1400B7 for ; Sat, 8 Nov 2014 03:02:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751491AbaKGQCM (ORCPT ); Fri, 7 Nov 2014 11:02:12 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:61301 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441AbaKGQCM (ORCPT ); Fri, 7 Nov 2014 11:02:12 -0500 Received: by mail-pa0-f47.google.com with SMTP id kx10so3746947pab.6 for ; Fri, 07 Nov 2014 08:02:11 -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=4S9ARZoQ0iiTtMOCb/snqE1g11Bb+NXcU7BHxhOVS0Q=; b=nKmlYkyL0q9SUiAIIk7x71EzDpZCB88cSvH+8SESpu291gRqep9VupBvLIaeO2EBB1 hFmdBATXdJL9vikUQsuEmfkMn5E8RZL4ntgGAhyu9UyAcI5bv4Xfoquy0v1rTsKP/9OI 0Q6u8MTlSX43l5to2NmwDFpFG09ahqvuOlPvQYfs6mLyeqrQJOXs3gnyXNCbt4+irUf0 Ex8EXZEty0zmWsKDGFGK5kKC4rohCwcB+ESfjqk6iHlPI7FQdwjJYK0z2X7YPESpLUQP a7AZMcw98gQD4vePuEaVxsz1poLGJLdIf+ILgk8Ngv50guzhIeNyWCridU4bl6GggQYq EFog== X-Received: by 10.66.237.145 with SMTP id vc17mr13235373pac.34.1415376131317; Fri, 07 Nov 2014 08:02:11 -0800 (PST) Received: from localhost ([216.228.120.20]) by mx.google.com with ESMTPSA id km5sm9176098pdb.18.2014.11.07.08.02.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Nov 2014 08:02:09 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Mike Turquette , Joerg Roedel , Russell King , Will Deacon , Catalin Marinas , Olof Johansson , David Riley , Stephen Warren , Alexandre Courbot , Peter De Schrijver , iommu@lists.linux-foundation.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 10/12] ARM: tegra: Enable IOMMU for display controllers on Tegra114 Date: Fri, 7 Nov 2014 17:01:01 +0100 Message-Id: <1415376063-17205-11-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1415376063-17205-1-git-send-email-thierry.reding@gmail.com> References: <1415376063-17205-1-git-send-email-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding Add iommus properties to the device tree nodes for the two display controllers found on Tegra114. 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/tegra114.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 2c26b07c11ed..c8c3b6438b4d 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -57,6 +58,8 @@ resets = <&tegra_car 27>; reset-names = "dc"; + iommus = <&mc TEGRA_SWGROUP_DC>; + nvidia,head = <0>; rgb { @@ -74,6 +77,8 @@ resets = <&tegra_car 26>; reset-names = "dc"; + iommus = <&mc TEGRA_SWGROUP_DCB>; + nvidia,head = <1>; rgb {