From: Mikko Perttunen <mperttunen@nvidia.com> To: thierry.reding@gmail.com, jonathanh@nvidia.com, digetx@gmail.com, airlied@linux.ie, daniel@ffwll.ch Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, talho@nvidia.com, bhuntsman@nvidia.com, Mikko Perttunen <mperttunen@nvidia.com> Subject: [PATCH v3 18/20] drm/tegra: Allocate per-engine channel in core code Date: Wed, 7 Oct 2020 20:12:36 +0300 [thread overview] Message-ID: <20201007171238.1795964-19-mperttunen@nvidia.com> (raw) In-Reply-To: <20201007171238.1795964-1-mperttunen@nvidia.com> To avoid duplication, allocate the per-engine shared channel in the core code instead. Once MLOCKs are implemented on Host1x side, we can also update this to avoid allocating a shared channel when MLOCKs are enabled. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- drivers/gpu/drm/tegra/drm.c | 11 +++++++++++ drivers/gpu/drm/tegra/drm.h | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 7437c67924aa..7124b0b0154b 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -887,6 +887,14 @@ static struct drm_driver tegra_drm_driver = { int tegra_drm_register_client(struct tegra_drm *tegra, struct tegra_drm_client *client) { + /* + * When MLOCKs are implemented, change to allocate a shared channel + * only when MLOCKs are disabled. + */ + client->shared_channel = host1x_channel_request(&client->base); + if (!client->shared_channel) + return -EBUSY; + mutex_lock(&tegra->clients_lock); list_add_tail(&client->list, &tegra->clients); client->drm = tegra; @@ -903,6 +911,9 @@ int tegra_drm_unregister_client(struct tegra_drm *tegra, client->drm = NULL; mutex_unlock(&tegra->clients_lock); + if (client->shared_channel) + host1x_channel_put(client->shared_channel); + return 0; } diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index b25443255be6..3fc42fd97911 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -86,8 +86,12 @@ struct tegra_drm_client { struct list_head list; struct tegra_drm *drm; + /* Set by driver */ unsigned int version; const struct tegra_drm_client_ops *ops; + + /* Set by TegraDRM core */ + struct host1x_channel *shared_channel; }; static inline struct tegra_drm_client * -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Mikko Perttunen <mperttunen@nvidia.com> To: thierry.reding@gmail.com, jonathanh@nvidia.com, digetx@gmail.com, airlied@linux.ie, daniel@ffwll.ch Cc: linux-tegra@vger.kernel.org, talho@nvidia.com, bhuntsman@nvidia.com, dri-devel@lists.freedesktop.org, Mikko Perttunen <mperttunen@nvidia.com> Subject: [PATCH v3 18/20] drm/tegra: Allocate per-engine channel in core code Date: Wed, 7 Oct 2020 20:12:36 +0300 [thread overview] Message-ID: <20201007171238.1795964-19-mperttunen@nvidia.com> (raw) In-Reply-To: <20201007171238.1795964-1-mperttunen@nvidia.com> To avoid duplication, allocate the per-engine shared channel in the core code instead. Once MLOCKs are implemented on Host1x side, we can also update this to avoid allocating a shared channel when MLOCKs are enabled. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- drivers/gpu/drm/tegra/drm.c | 11 +++++++++++ drivers/gpu/drm/tegra/drm.h | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 7437c67924aa..7124b0b0154b 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -887,6 +887,14 @@ static struct drm_driver tegra_drm_driver = { int tegra_drm_register_client(struct tegra_drm *tegra, struct tegra_drm_client *client) { + /* + * When MLOCKs are implemented, change to allocate a shared channel + * only when MLOCKs are disabled. + */ + client->shared_channel = host1x_channel_request(&client->base); + if (!client->shared_channel) + return -EBUSY; + mutex_lock(&tegra->clients_lock); list_add_tail(&client->list, &tegra->clients); client->drm = tegra; @@ -903,6 +911,9 @@ int tegra_drm_unregister_client(struct tegra_drm *tegra, client->drm = NULL; mutex_unlock(&tegra->clients_lock); + if (client->shared_channel) + host1x_channel_put(client->shared_channel); + return 0; } diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index b25443255be6..3fc42fd97911 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -86,8 +86,12 @@ struct tegra_drm_client { struct list_head list; struct tegra_drm *drm; + /* Set by driver */ unsigned int version; const struct tegra_drm_client_ops *ops; + + /* Set by TegraDRM core */ + struct host1x_channel *shared_channel; }; static inline struct tegra_drm_client * -- 2.28.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-07 17:17 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-07 17:12 [PATCH v3 00/20] Host1x/TegraDRM UAPI Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 01/20] gpu: host1x: Use different lock classes for each client Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 02/20] gpu: host1x: Allow syncpoints without associated client Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 03/20] gpu: host1x: Show number of pending waiters in debugfs Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 04/20] gpu: host1x: Remove cancelled waiters immediately Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 05/20] gpu: host1x: Use HW-equivalent syncpoint expiration check Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 06/20] gpu: host1x: Cleanup and refcounting for syncpoints Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 22:23 ` kernel test robot 2020-10-07 22:23 ` kernel test robot 2020-10-07 22:23 ` kernel test robot 2020-10-07 17:12 ` [PATCH v3 07/20] gpu: host1x: Introduce UAPI header Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 08/20] gpu: host1x: Implement /dev/host1x device node Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 09/20] gpu: host1x: DMA fences and userspace fence creation Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 23:13 ` kernel test robot 2020-10-07 23:13 ` kernel test robot 2020-10-07 23:13 ` kernel test robot 2020-10-08 11:13 ` kernel test robot 2020-10-08 11:13 ` kernel test robot 2020-10-08 11:13 ` kernel test robot 2020-10-07 17:12 ` [PATCH v3 10/20] gpu: host1x: Add no-recovery mode Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 11/20] gpu: host1x: Add job release callback Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 12/20] gpu: host1x: Add support for syncpoint waits in CDMA pushbuffer Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 13/20] gpu: host1x: Reset max value when freeing a syncpoint Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 14/20] gpu: host1x: Reserve VBLANK syncpoints at initialization Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 15/20] drm/tegra: Add new UAPI to header Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 16/20] drm/tegra: Boot VIC during runtime PM resume Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 17/20] drm/tegra: Set resv fields when importing/exporting GEMs Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen [this message] 2020-10-07 17:12 ` [PATCH v3 18/20] drm/tegra: Allocate per-engine channel in core code Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 19/20] drm/tegra: Implement new UAPI Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen 2020-10-08 3:42 ` kernel test robot 2020-10-08 3:42 ` kernel test robot 2020-10-08 3:42 ` kernel test robot 2020-10-19 2:21 ` Dmitry Osipenko 2020-10-19 2:21 ` Dmitry Osipenko 2020-10-19 8:13 ` Mikko Perttunen 2020-10-19 8:13 ` Mikko Perttunen 2020-10-19 17:27 ` Dmitry Osipenko 2020-10-19 17:27 ` Dmitry Osipenko 2020-10-20 9:18 ` Mikko Perttunen 2020-10-20 9:18 ` Mikko Perttunen 2020-10-22 4:20 ` Dmitry Osipenko 2020-10-22 4:20 ` Dmitry Osipenko 2020-10-26 9:11 ` Mikko Perttunen 2020-10-26 9:11 ` Mikko Perttunen 2020-10-27 19:06 ` Dmitry Osipenko 2020-10-27 19:06 ` Dmitry Osipenko 2020-10-28 9:54 ` Mikko Perttunen 2020-10-28 9:54 ` Mikko Perttunen 2020-10-30 23:13 ` Dmitry Osipenko 2020-10-30 23:13 ` Dmitry Osipenko 2020-11-09 14:53 ` Mikko Perttunen 2020-11-09 14:53 ` Mikko Perttunen 2020-11-12 18:35 ` Dmitry Osipenko 2020-11-12 18:35 ` Dmitry Osipenko 2020-10-20 11:40 ` Daniel Vetter 2020-10-20 11:40 ` Daniel Vetter 2020-10-20 12:51 ` Mikko Perttunen 2020-10-20 12:51 ` Mikko Perttunen 2020-10-07 17:12 ` [PATCH v3 20/20] drm/tegra: Add job firewall Mikko Perttunen 2020-10-07 17:12 ` Mikko Perttunen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201007171238.1795964-19-mperttunen@nvidia.com \ --to=mperttunen@nvidia.com \ --cc=airlied@linux.ie \ --cc=bhuntsman@nvidia.com \ --cc=daniel@ffwll.ch \ --cc=digetx@gmail.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jonathanh@nvidia.com \ --cc=linux-tegra@vger.kernel.org \ --cc=talho@nvidia.com \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.