From patchwork Mon Apr 23 06:57:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10356241 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 A7039601D3 for ; Mon, 23 Apr 2018 06:57:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9993328992 for ; Mon, 23 Apr 2018 06:57:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D153289CA; Mon, 23 Apr 2018 06:57:53 +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=-5.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, 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 0267A28992 for ; Mon, 23 Apr 2018 06:57:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39BE66E10A; Mon, 23 Apr 2018 06:57:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF9B46E10A for ; Mon, 23 Apr 2018 06:57:48 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id p5-v6so10189196wre.12 for ; Sun, 22 Apr 2018 23:57:48 -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; bh=nqnQIsaIdPng9dgIH7ZjtGui1qeOqEe/UI+9Np+J8/I=; b=pKScIkM0ftX9kcOLIM4kNnYsr/+hQFRZ/ry5uf89MoZAbJQqAk5kzsPYL2EOFW7Aqt L75VYVV4obwTxmsx/OjZHJbmwtyxRA60iiXCUkdZwz/8UKSLgHgPuDv0ov5WwlsWYZRl 7RIIlH7aJt0OYRw0uGLdI9b9BpZqVMID2qXFoGrO8zdGmaEZ7eKEKNnQRUCZV5hGmpHs l9GYv56dHb9SF+sXuitiXaVydzvhLSASyYLoNXB8knqoY2dN8YpdtEUEBWaREt2SRB8Q +54xpNa/otHsJRDg9ArPFH3ThfdKBoh5qkXfelL/IT4opmS3cJ8hilGKmNtRXc5Wy+R8 rzPA== 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; bh=nqnQIsaIdPng9dgIH7ZjtGui1qeOqEe/UI+9Np+J8/I=; b=sWKMTXbgKbh7gdJKyXmb4K0LF3mUbEsprSqizBaIOBi5Ocyb7qOrMP1IGm4SVoyBtC wGYIuu3AS1OB+y2iI4MExLa7/m3QNBItgxAwA114sasIZbWhTpXPSG+fPLrjwnub0mrL bkuzsQ6AevqS5Gacr6wJhd+qKLJizKCpfUvkLA/nnClI8M5SaoDlCKB5uTykOZ1Gq2k4 LfSTUFIeEvktU8QQbGaQfnVXe60gi07/Xo9qbItNgoCwCuI/CkwOkXFVW2LFbO9kf0en WrKKcZbM7LFPPo1sqBFxrrzFYY+/USBWwArGxCR4GTyPZ/xQ0o/b6Syl/ydePU3JOe7F bAUw== X-Gm-Message-State: ALQs6tAVOcq/qhc2Kuqe0hef5DtG6U/KCYu0x5jN1n5bLeiTBnxmzcw4 LmENivflc5AKQo+q2R+apseTmA== X-Google-Smtp-Source: AIpwx4+U/wAmyrz+GXJeoHKEHqffha5LUE7s8u1XguyaH9Y5E38vVjMR2dfQPz0z2RIEl/rk7gTVFQ== X-Received: by 10.28.6.8 with SMTP id 8mr9375004wmg.39.1524466667315; Sun, 22 Apr 2018 23:57:47 -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 80sm11352451wml.44.2018.04.22.23.57.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 23:57:46 -0700 (PDT) From: Thierry Reding To: Thierry Reding Subject: [PATCH 1/2] drm/tegra: Fix order of teardown in IOMMU case Date: Mon, 23 Apr 2018 08:57:44 +0200 Message-Id: <20180423065745.26102-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.17.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, Dmitry Osipenko , dri-devel@lists.freedesktop.org, Mikko Perttunen MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding The original code works fine, this is merely a cosmetic change to make the teardown order the reverse of the setup order. Signed-off-by: Thierry Reding Reviewed-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/drm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 1cfe1e7e2feb..4a696fa274a3 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -207,10 +207,10 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) drm_mode_config_cleanup(drm); if (tegra->domain) { - iommu_domain_free(tegra->domain); - drm_mm_takedown(&tegra->mm); mutex_destroy(&tegra->mm_lock); + drm_mm_takedown(&tegra->mm); put_iova_domain(&tegra->carveout.domain); + iommu_domain_free(tegra->domain); } free: kfree(tegra); @@ -233,10 +233,10 @@ static void tegra_drm_unload(struct drm_device *drm) return; if (tegra->domain) { - iommu_domain_free(tegra->domain); - drm_mm_takedown(&tegra->mm); mutex_destroy(&tegra->mm_lock); + drm_mm_takedown(&tegra->mm); put_iova_domain(&tegra->carveout.domain); + iommu_domain_free(tegra->domain); } kfree(tegra);