From patchwork Thu Aug 17 12:56:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 9906293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 03B0B60386 for ; Thu, 17 Aug 2017 13:03:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE1EC28AE1 for ; Thu, 17 Aug 2017 13:03:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1BFC28B05; Thu, 17 Aug 2017 13:03:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3A0F028AE1 for ; Thu, 17 Aug 2017 13:03:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B18666E5B6; Thu, 17 Aug 2017 13:03:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from theia.8bytes.org (8bytes.org [81.169.241.247]) by gabe.freedesktop.org (Postfix) with ESMTPS id 644AF6E5AD for ; Thu, 17 Aug 2017 13:03:46 +0000 (UTC) Received: by theia.8bytes.org (Postfix, from userid 1000) id 705B5248; Thu, 17 Aug 2017 14:56:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1502974615; bh=OVNc4wGTIhOGueR67wc15gnT2HvTF2a6ifev5baWirg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=naO4LYKN3wDbIOilXZOhN1BJNix3lk4zaudbK503bRQRKvgiY7lqezWa6/Hek2m96 Q6/5UGS1WSDMn2UzjvUjWI4BgLnVf/VwUdrlAE6/XMN1BIwN/OaQxr/dBSfV3u2cut Q5zgtwpP8aQZEEdbvfc86e2L2JyHjKYz3MqpAD9hsjQovpnVVLNja7/Sxppwwm8TNH +bYu1JZ7dk/kXGLOYPtP5uqF0iaauMTRS/dlJiAlU3OW8SUOlq16Zpou0YmjOjhJQ8 KA+uLTzn1FjYTTRwzhe25b99pqObRigYPu5yZTOsQdtCzqUkRAFdlnXX7LNXrE7/yX xp7/MJlBd+QvQ== From: Joerg Roedel To: iommu@lists.linux-foundation.org Subject: [PATCH 10/13] drm/tegra: Use sychronized interface of the IOMMU-API Date: Thu, 17 Aug 2017 14:56:33 +0200 Message-Id: <1502974596-23835-11-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502974596-23835-1-git-send-email-joro@8bytes.org> References: <1502974596-23835-1-git-send-email-joro@8bytes.org> Cc: Joerg Roedel , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jonathan Hunter , Thierry Reding , Suravee Suthikulpanit , linux-tegra@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel The map and unmap functions of the IOMMU-API changed their semantics: They do no longer guarantee that the hardware TLBs are synchronized with the page-table updates they made. To make conversion easier, new synchronized functions have been introduced which give these guarantees again until the code is converted to use the new TLB-flush interface of the IOMMU-API, which allows certain optimizations. But for now, just convert this code to use the synchronized functions so that it will behave as before. Cc: Thierry Reding Cc: David Airlie Cc: Jonathan Hunter Cc: dri-devel@lists.freedesktop.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Joerg Roedel Acked-by: Thierry Reding --- drivers/gpu/drm/tegra/drm.c | 6 +++--- drivers/gpu/drm/tegra/gem.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 518f4b6..bc4528ee 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1156,8 +1156,8 @@ void *tegra_drm_alloc(struct tegra_drm *tegra, size_t size, } *dma = iova_dma_addr(&tegra->carveout.domain, alloc); - err = iommu_map(tegra->domain, *dma, virt_to_phys(virt), - size, IOMMU_READ | IOMMU_WRITE); + err = iommu_map_sync(tegra->domain, *dma, virt_to_phys(virt), + size, IOMMU_READ | IOMMU_WRITE); if (err < 0) goto free_iova; @@ -1180,7 +1180,7 @@ void tegra_drm_free(struct tegra_drm *tegra, size_t size, void *virt, size = PAGE_ALIGN(size); if (tegra->domain) { - iommu_unmap(tegra->domain, dma, size); + iommu_unmap_sync(tegra->domain, dma, size); free_iova(&tegra->carveout.domain, iova_pfn(&tegra->carveout.domain, dma)); } diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 7a39a35..639bc75 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -135,8 +135,8 @@ static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) bo->paddr = bo->mm->start; - err = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl, - bo->sgt->nents, prot); + err = iommu_map_sg_sync(tegra->domain, bo->paddr, bo->sgt->sgl, + bo->sgt->nents, prot); if (err < 0) { dev_err(tegra->drm->dev, "failed to map buffer: %zd\n", err); goto remove; @@ -162,7 +162,7 @@ static int tegra_bo_iommu_unmap(struct tegra_drm *tegra, struct tegra_bo *bo) return 0; mutex_lock(&tegra->mm_lock); - iommu_unmap(tegra->domain, bo->paddr, bo->size); + iommu_unmap_sync(tegra->domain, bo->paddr, bo->size); drm_mm_remove_node(bo->mm); mutex_unlock(&tegra->mm_lock);