From patchwork Thu May 3 23:47:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10382275 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 24F7060467 for ; Sat, 5 May 2018 20:08:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14A09205F6 for ; Sat, 5 May 2018 20:08:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 097D52876C; Sat, 5 May 2018 20:08:12 +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 895EE205F6 for ; Sat, 5 May 2018 20:08:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D89E56E1A8; Sat, 5 May 2018 20:07:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 737AD6E2B0 for ; Thu, 3 May 2018 23:52:09 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id j193-v6so28444753lfg.6 for ; Thu, 03 May 2018 16:52:09 -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=Yg4SKFBilFp6Q0Vj5OOe8shvAAQf8nH4Wc3WkCJuVR0=; b=nemWpjjuzQpbu0U6Tk9WT6rt4gELvVJq0ozUx3fl0Y+XTQhw7ILvxwsizWIy2Ahedg PKXimoark80Mpw4Y3m5x24cERSaf9EavrkJQ/13Bo7f+T6GshPljY6+1u6oxAtrIWrjg 0aZNK1Rnl7hx+tFdINFk8pwdCak9hzoxl34cqbyKjHE0NLImnx4VXhcBfZS1U/XzFb86 TiePFg6WUpCLk/zEFHkHW7LwkEDEQQIhN2QTUdHhIVxhS6e78i/gCmkPe1pnAcgeP6tb Uokd29VMhp51BedsJ/gdV1NrYfdTW62cGokMQfO/CWmhJeb9K+PAtlTR3fKYrEcDH8ib 1KUQ== 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=Yg4SKFBilFp6Q0Vj5OOe8shvAAQf8nH4Wc3WkCJuVR0=; b=WW2OgjPqpa8YzSEzc1eO9c1udFaPoDzQLjgpPahHox/VuixoI4aOGxLpPpDfupz/63 VgFGv8tUenLhgH2fXROXpq3fzhU3g1k9kzXMyf7Uvt4TqVhCmdg5e1sN9B534M4DGHTm aVhxZ6dxFPMLX8ojj2stEqiCigc7ry9prmVWlR0s8Aa7V9luoLa4aPAc8mKekCT8LoEt JLHKV6YWbXbxvuYwbwZ1IvBMBJjpsWdEsvuAptCiGXZQYeb8ET5QyrXc1R1ZkhhhUns+ UxlmT5/AmwiZ7HLxXgTayyhQoxiScQQtcHqDltKlsjTSw+nzIbAYBBQx6Nwcjuke5/lm sqzw== X-Gm-Message-State: ALQs6tAX6x3UyQL7whu/TILsB4OgalHIL+LeYGMwdRm2EGOwqVmvtVJp MRZUQ9ZRcNLyObWbHG00cuY= X-Google-Smtp-Source: AB8JxZoQ38SGfRCZa1C7d7PKni1s5P8IrAOduqHkCCqG9fg6e3XCFG5v7f1RvlpafsAXkKiJypEhmQ== X-Received: by 2002:a2e:7f0a:: with SMTP id a10-v6mr17083220ljd.78.1525391527942; Thu, 03 May 2018 16:52:07 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-91-130.pppoe.spdop.ru. [109.252.91.130]) by smtp.gmail.com with ESMTPSA id m6-v6sm3077153lfb.61.2018.05.03.16.52.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 16:52:07 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v1 1/5] drm/tegra: dc: Balance IOMMU group refcounting Date: Fri, 4 May 2018 02:47:19 +0300 Message-Id: <20180503234723.4368-2-digetx@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180503234723.4368-1-digetx@gmail.com> References: <20180503234723.4368-1-digetx@gmail.com> X-Mailman-Approved-At: Sat, 05 May 2018 20:07:53 +0000 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, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Remove unneeded iommu_group_get() and add missing iommu_group_put(), correcting IOMMU group refcount. This is a minor correction / cleanup that doesn't really fix anything because Tegra's IOMMU driver are built-in and hence groups refcounting can't hold IOMMU driver from unloading. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/dc.c | 35 +++++++++++++++++------------------ drivers/gpu/drm/tegra/dc.h | 2 +- drivers/gpu/drm/tegra/drm.h | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index d7a0f62c6e2e..9fc34c6a7218 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1927,7 +1927,6 @@ static irqreturn_t tegra_dc_irq(int irq, void *data) static int tegra_dc_init(struct host1x_client *client) { struct drm_device *drm = dev_get_drvdata(client->parent); - struct iommu_group *group = iommu_group_get(client->dev); unsigned long flags = HOST1X_SYNCPT_CLIENT_MANAGED; struct tegra_dc *dc = host1x_client_to_dc(client); struct tegra_drm *tegra = drm->dev_private; @@ -1939,20 +1938,21 @@ static int tegra_dc_init(struct host1x_client *client) if (!dc->syncpt) dev_warn(dc->dev, "failed to allocate syncpoint\n"); - if (group && tegra->domain) { - if (group != tegra->group) { - err = iommu_attach_group(tegra->domain, group); + if (tegra->domain) { + dc->group = iommu_group_get(client->dev); + + if (dc->group && dc->group != tegra->dc_group) { + err = iommu_attach_group(tegra->domain, dc->group); if (err < 0) { dev_err(dc->dev, "failed to attach to domain: %d\n", err); + iommu_group_put(dc->group); return err; } - tegra->group = group; + tegra->dc_group = dc->group; } - - dc->domain = tegra->domain; } if (dc->soc->wgrps) @@ -2017,13 +2017,13 @@ static int tegra_dc_init(struct host1x_client *client) if (!IS_ERR(primary)) drm_plane_cleanup(primary); - if (group && dc->domain) { - if (group == tegra->group) { - iommu_detach_group(dc->domain, group); - tegra->group = NULL; + if (dc->group) { + if (dc->group && dc->group == tegra->dc_group) { + iommu_detach_group(tegra->domain, dc->group); + tegra->dc_group = NULL; } - dc->domain = NULL; + iommu_group_put(dc->group); } return err; @@ -2032,7 +2032,6 @@ static int tegra_dc_init(struct host1x_client *client) static int tegra_dc_exit(struct host1x_client *client) { struct drm_device *drm = dev_get_drvdata(client->parent); - struct iommu_group *group = iommu_group_get(client->dev); struct tegra_dc *dc = host1x_client_to_dc(client); struct tegra_drm *tegra = drm->dev_private; int err; @@ -2045,13 +2044,13 @@ static int tegra_dc_exit(struct host1x_client *client) return err; } - if (group && dc->domain) { - if (group == tegra->group) { - iommu_detach_group(dc->domain, group); - tegra->group = NULL; + if (dc->group) { + if (dc->group && dc->group == tegra->dc_group) { + iommu_detach_group(tegra->domain, dc->group); + tegra->dc_group = NULL; } - dc->domain = NULL; + iommu_group_put(dc->group); } host1x_syncpt_free(dc->syncpt); diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h index ca5cac6bf8ea..5ca4e07333bb 100644 --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h @@ -94,7 +94,7 @@ struct tegra_dc { const struct tegra_dc_soc_info *soc; - struct iommu_domain *domain; + struct iommu_group *group; }; static inline struct tegra_dc * diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 4f41aaec8530..7777640a6911 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -46,7 +46,7 @@ struct tegra_drm { struct drm_device *drm; struct iommu_domain *domain; - struct iommu_group *group; + struct iommu_group *dc_group; struct mutex mm_lock; struct drm_mm mm;