From patchwork Wed Apr 25 10:10:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 904103 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RsAON2TP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WGDh0MWyz9ryk for ; Wed, 25 Apr 2018 20:11:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751860AbeDYKK7 (ORCPT ); Wed, 25 Apr 2018 06:10:59 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:38179 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487AbeDYKK7 (ORCPT ); Wed, 25 Apr 2018 06:10:59 -0400 Received: by mail-wm0-f67.google.com with SMTP id i3so5776493wmf.3 for ; Wed, 25 Apr 2018 03:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z7EOzZnEHs1fB6Uc6QfHyCaSUfm2BD9P+0QpkkcvcNQ=; b=RsAON2TP+cPoP2o3IzMQ3k04nDhfncm7B6tB7FjugNbNp0oXRwBfzVsOfdaVAGCxBa Jw+2Khhfs5Rd5P4len2Gblsu588QqTNAzDEjvBrDzBSDPUs8Q1YUwokY9T+C5kJm1ukF NZWWW7yMfT3esK6aQAsXId6rYu+1XC7e0Yqq7FA1vq0avlSF9lPRo1zmjk/5qsnHSbRH bHmhkA22E/9Y1bqwcNJeTTAN3IC/zd7poczghzAIn/XKWZvQmSbiaN+4JwmLBzQOTUEE qZuAtFWJaYk7JCQZDKpRTLlMtBtQTx/PA2p0TjELkgr90CofmlJeXrDbmE7+wi30AFxW goNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z7EOzZnEHs1fB6Uc6QfHyCaSUfm2BD9P+0QpkkcvcNQ=; b=BsakusaIcmfRZDTSW8A6NoH+vEVTZT3stkMcTO6OavW0938tUj6F4R42evMPKWMwpb lc8ofaGoqpXQiD3Y07tuNuPI83zLA/m22hFTbQmA+TsjNrbQ77UCntMIaIjc9tM2s4MZ yJVkM1kO953kWFTBdEQwn+Me4WHphYoJDOk5PT46SgwQLI3M3i2m++T165EhG4+i7N/8 P+zKiWUKjiUYk4+Mw9HNfza4viemk0NrqwNAxEI6sKDuRFIo7XeDyUFzHGwqAaEFdWd/ HT/vH/H9rbkXZEKEYQDNrEqZfXP/yhDukfYqWZIJB9EMaRMd1jNKi/GxRFALrcgDLUYC 0mWg== X-Gm-Message-State: ALQs6tC67vDIVzSMxREeBDaFwkgMpe+thxVPrTFYN0FoC89AvTVcahjT f3/GU0ngaI8bPCK1PdEMH8vQSQ== X-Google-Smtp-Source: AIpwx4/IMfEDc+8M5ZhLkgUGE6wK8QB47Fy4KRGXqTqRw2v0bo8fpmOKoIasigj7f18OPi8gVVwvbw== X-Received: by 10.28.101.6 with SMTP id z6mr13556468wmb.86.1524651057865; Wed, 25 Apr 2018 03:10:57 -0700 (PDT) Received: from localhost (p200300E41F041C0032947E635CB49D15.dip0.t-ipconnect.de. [2003:e4:1f04:1c00:3294:7e63:5cb4:9d15]) by smtp.gmail.com with ESMTPSA id h133sm12144608wmf.47.2018.04.25.03.10.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Apr 2018 03:10:57 -0700 (PDT) From: Thierry Reding To: Christoph Hellwig , Joerg Roedel Cc: Daniel Vetter , Russell King , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH v2 4/5] drm/nouveau: tegra: Use dma_iommu_detach_device() Date: Wed, 25 Apr 2018 12:10:50 +0200 Message-Id: <20180425101051.15349-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425101051.15349-1-thierry.reding@gmail.com> References: <20180425101051.15349-1-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 Use the new dma_iommu_detach_device() function to replace the open-coded equivalent. Signed-off-by: Thierry Reding --- .../drm/nouveau/nvkm/engine/device/tegra.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c index 23428a7056e9..c0a7f3839cbb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c @@ -20,10 +20,6 @@ * DEALINGS IN THE SOFTWARE. */ -#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) -#include -#endif - #include #ifdef CONFIG_NOUVEAU_PLATFORM_DRIVER #include "priv.h" @@ -110,19 +106,8 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev) unsigned long pgsize_bitmap; int ret; -#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) - if (dev->archdata.mapping) { - struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev); - - arm_iommu_release_mapping(mapping); - arm_iommu_detach_device(dev); - - if (dev->archdata.dma_coherent) - set_dma_ops(dev, &arm_coherent_dma_ops); - else - set_dma_ops(dev, &arm_dma_ops); - } -#endif + /* make sure we can use the IOMMU exclusively */ + dma_iommu_detach_device(dev); if (!tdev->func->iommu_bit) return;