From patchwork Mon Oct 13 10:33:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 399143 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 DB83F1400B7 for ; Mon, 13 Oct 2014 21:34:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbaJMKeQ (ORCPT ); Mon, 13 Oct 2014 06:34:16 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:38798 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753791AbaJMKeQ (ORCPT ); Mon, 13 Oct 2014 06:34:16 -0400 Received: by mail-wg0-f44.google.com with SMTP id y10so8300365wgg.27 for ; Mon, 13 Oct 2014 03:34:15 -0700 (PDT) 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=yBF4rlu+TZY30UnjglLJwEQLkpI2Ygq+UW4vAJ0eIfc=; b=Ng4v1/jp0lLvtKZfVaU94m3SMecmuaNp38NfWtYzix2rRax9MtdCqKhMP0TooWXcJq tX9QRAJjqX6btmAZuZfXkuQWBYFyVUrkz9Z6cyk1RfGwfkP6c0OJ6O6zY9uLIsClNMk0 wkUGBc6erwrvzK4WXKgZ7yaridj0PG88+GtEEmh9UkvYQLSNs4Vnube3uwu9/DPn14/9 MmGGV84pIgRYY7xrJNu3eZCMZ2SIVz2wnkUIQAyqhXfT56ATPFcRYrMxBDn82fGDUJ/f N2PiFNrZsN3ndh4acImajRu0UA5IQR8npab+z1g3onUnbgE4Y9pSp8ohfljelM2QNS08 p9bg== X-Received: by 10.180.101.230 with SMTP id fj6mr39889wib.70.1413196454988; Mon, 13 Oct 2014 03:34:14 -0700 (PDT) Received: from localhost (port-4359.pppoe.wtnet.de. [84.46.17.24]) by mx.google.com with ESMTPSA id fx10sm11702814wib.12.2014.10.13.03.34.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Oct 2014 03:34:14 -0700 (PDT) From: Thierry Reding To: linux-tegra@vger.kernel.org Cc: Joerg Roedel , Stephen Warren , Alexandre Courbot , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/12] ARM: tegra: Enable IOMMU for display controllers on Tegra124 Date: Mon, 13 Oct 2014 12:33:54 +0200 Message-Id: <1413196434-5292-12-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413196434-5292-1-git-send-email-thierry.reding@gmail.com> References: <1413196434-5292-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 Tegra124. 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/tegra124.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index afe9c6a34709..652f595784e1 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -102,6 +103,8 @@ resets = <&tegra_car 27>; reset-names = "dc"; + iommus = <&mc TEGRA_SWGROUP_DC>; + nvidia,head = <0>; }; @@ -115,6 +118,8 @@ resets = <&tegra_car 26>; reset-names = "dc"; + iommus = <&mc TEGRA_SWGROUP_DCB>; + nvidia,head = <1>; };