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 v5 16/21] drm/tegra: Boot VIC during runtime PM resume Date: Mon, 11 Jan 2021 15:00:14 +0200 [thread overview] Message-ID: <20210111130019.3515669-17-mperttunen@nvidia.com> (raw) In-Reply-To: <20210111130019.3515669-1-mperttunen@nvidia.com> With the new UAPI implementation, engines are powered on and off when there are active jobs, and the core code handles channel allocation. To accommodate that, boot the engine as part of runtime PM instead of using the open_channel callback, which is not used by the new submit path. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- v3: * runtime_get/put is now done directly from submit path, so no callbacks are added * Reworded. --- drivers/gpu/drm/tegra/vic.c | 114 +++++++++++++++++------------------- 1 file changed, 53 insertions(+), 61 deletions(-) diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index cb476da59adc..5d2ad125dca3 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -29,7 +29,6 @@ struct vic_config { struct vic { struct falcon falcon; - bool booted; void __iomem *regs; struct tegra_drm_client client; @@ -52,48 +51,6 @@ static void vic_writel(struct vic *vic, u32 value, unsigned int offset) writel(value, vic->regs + offset); } -static int vic_runtime_resume(struct device *dev) -{ - struct vic *vic = dev_get_drvdata(dev); - int err; - - err = clk_prepare_enable(vic->clk); - if (err < 0) - return err; - - usleep_range(10, 20); - - err = reset_control_deassert(vic->rst); - if (err < 0) - goto disable; - - usleep_range(10, 20); - - return 0; - -disable: - clk_disable_unprepare(vic->clk); - return err; -} - -static int vic_runtime_suspend(struct device *dev) -{ - struct vic *vic = dev_get_drvdata(dev); - int err; - - err = reset_control_assert(vic->rst); - if (err < 0) - return err; - - usleep_range(2000, 4000); - - clk_disable_unprepare(vic->clk); - - vic->booted = false; - - return 0; -} - static int vic_boot(struct vic *vic) { #ifdef CONFIG_IOMMU_API @@ -103,9 +60,6 @@ static int vic_boot(struct vic *vic) void *hdr; int err = 0; - if (vic->booted) - return 0; - #ifdef CONFIG_IOMMU_API if (vic->config->supports_sid && spec) { u32 value; @@ -153,8 +107,6 @@ static int vic_boot(struct vic *vic) return err; } - vic->booted = true; - return 0; } @@ -308,35 +260,76 @@ static int vic_load_firmware(struct vic *vic) return err; } -static int vic_open_channel(struct tegra_drm_client *client, - struct tegra_drm_context *context) + +static int vic_runtime_resume(struct device *dev) { - struct vic *vic = to_vic(client); + struct vic *vic = dev_get_drvdata(dev); int err; - err = pm_runtime_get_sync(vic->dev); + err = clk_prepare_enable(vic->clk); if (err < 0) return err; + usleep_range(10, 20); + + err = reset_control_deassert(vic->rst); + if (err < 0) + goto disable; + + usleep_range(10, 20); + err = vic_load_firmware(vic); if (err < 0) - goto rpm_put; + goto assert; err = vic_boot(vic); if (err < 0) - goto rpm_put; + goto assert; + + return 0; + +assert: + reset_control_assert(vic->rst); +disable: + clk_disable_unprepare(vic->clk); + return err; +} + +static int vic_runtime_suspend(struct device *dev) +{ + struct vic *vic = dev_get_drvdata(dev); + int err; + + err = reset_control_assert(vic->rst); + if (err < 0) + return err; + + usleep_range(2000, 4000); + + clk_disable_unprepare(vic->clk); + + return 0; +} + +static int vic_open_channel(struct tegra_drm_client *client, + struct tegra_drm_context *context) +{ + struct vic *vic = to_vic(client); + int err; + + err = pm_runtime_get_sync(vic->dev); + if (err < 0) { + pm_runtime_put(vic->dev); + return err; + } context->channel = host1x_channel_get(vic->channel); if (!context->channel) { - err = -ENOMEM; - goto rpm_put; + pm_runtime_put(vic->dev); + return -ENOMEM; } return 0; - -rpm_put: - pm_runtime_put(vic->dev); - return err; } static void vic_close_channel(struct tegra_drm_context *context) @@ -344,7 +337,6 @@ static void vic_close_channel(struct tegra_drm_context *context) struct vic *vic = to_vic(context->client); host1x_channel_put(context->channel); - pm_runtime_put(vic->dev); } -- 2.30.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 v5 16/21] drm/tegra: Boot VIC during runtime PM resume Date: Mon, 11 Jan 2021 15:00:14 +0200 [thread overview] Message-ID: <20210111130019.3515669-17-mperttunen@nvidia.com> (raw) In-Reply-To: <20210111130019.3515669-1-mperttunen@nvidia.com> With the new UAPI implementation, engines are powered on and off when there are active jobs, and the core code handles channel allocation. To accommodate that, boot the engine as part of runtime PM instead of using the open_channel callback, which is not used by the new submit path. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> --- v3: * runtime_get/put is now done directly from submit path, so no callbacks are added * Reworded. --- drivers/gpu/drm/tegra/vic.c | 114 +++++++++++++++++------------------- 1 file changed, 53 insertions(+), 61 deletions(-) diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index cb476da59adc..5d2ad125dca3 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -29,7 +29,6 @@ struct vic_config { struct vic { struct falcon falcon; - bool booted; void __iomem *regs; struct tegra_drm_client client; @@ -52,48 +51,6 @@ static void vic_writel(struct vic *vic, u32 value, unsigned int offset) writel(value, vic->regs + offset); } -static int vic_runtime_resume(struct device *dev) -{ - struct vic *vic = dev_get_drvdata(dev); - int err; - - err = clk_prepare_enable(vic->clk); - if (err < 0) - return err; - - usleep_range(10, 20); - - err = reset_control_deassert(vic->rst); - if (err < 0) - goto disable; - - usleep_range(10, 20); - - return 0; - -disable: - clk_disable_unprepare(vic->clk); - return err; -} - -static int vic_runtime_suspend(struct device *dev) -{ - struct vic *vic = dev_get_drvdata(dev); - int err; - - err = reset_control_assert(vic->rst); - if (err < 0) - return err; - - usleep_range(2000, 4000); - - clk_disable_unprepare(vic->clk); - - vic->booted = false; - - return 0; -} - static int vic_boot(struct vic *vic) { #ifdef CONFIG_IOMMU_API @@ -103,9 +60,6 @@ static int vic_boot(struct vic *vic) void *hdr; int err = 0; - if (vic->booted) - return 0; - #ifdef CONFIG_IOMMU_API if (vic->config->supports_sid && spec) { u32 value; @@ -153,8 +107,6 @@ static int vic_boot(struct vic *vic) return err; } - vic->booted = true; - return 0; } @@ -308,35 +260,76 @@ static int vic_load_firmware(struct vic *vic) return err; } -static int vic_open_channel(struct tegra_drm_client *client, - struct tegra_drm_context *context) + +static int vic_runtime_resume(struct device *dev) { - struct vic *vic = to_vic(client); + struct vic *vic = dev_get_drvdata(dev); int err; - err = pm_runtime_get_sync(vic->dev); + err = clk_prepare_enable(vic->clk); if (err < 0) return err; + usleep_range(10, 20); + + err = reset_control_deassert(vic->rst); + if (err < 0) + goto disable; + + usleep_range(10, 20); + err = vic_load_firmware(vic); if (err < 0) - goto rpm_put; + goto assert; err = vic_boot(vic); if (err < 0) - goto rpm_put; + goto assert; + + return 0; + +assert: + reset_control_assert(vic->rst); +disable: + clk_disable_unprepare(vic->clk); + return err; +} + +static int vic_runtime_suspend(struct device *dev) +{ + struct vic *vic = dev_get_drvdata(dev); + int err; + + err = reset_control_assert(vic->rst); + if (err < 0) + return err; + + usleep_range(2000, 4000); + + clk_disable_unprepare(vic->clk); + + return 0; +} + +static int vic_open_channel(struct tegra_drm_client *client, + struct tegra_drm_context *context) +{ + struct vic *vic = to_vic(client); + int err; + + err = pm_runtime_get_sync(vic->dev); + if (err < 0) { + pm_runtime_put(vic->dev); + return err; + } context->channel = host1x_channel_get(vic->channel); if (!context->channel) { - err = -ENOMEM; - goto rpm_put; + pm_runtime_put(vic->dev); + return -ENOMEM; } return 0; - -rpm_put: - pm_runtime_put(vic->dev); - return err; } static void vic_close_channel(struct tegra_drm_context *context) @@ -344,7 +337,6 @@ static void vic_close_channel(struct tegra_drm_context *context) struct vic *vic = to_vic(context->client); host1x_channel_put(context->channel); - pm_runtime_put(vic->dev); } -- 2.30.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-11 13:02 UTC|newest] Thread overview: 195+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-11 12:59 [PATCH v5 00/21] Host1x/TegraDRM UAPI Mikko Perttunen 2021-01-11 12:59 ` Mikko Perttunen 2021-01-11 12:59 ` [PATCH v5 01/21] gpu: host1x: Use different lock classes for each client Mikko Perttunen 2021-01-11 12:59 ` Mikko Perttunen 2021-03-22 14:46 ` Thierry Reding 2021-03-22 14:46 ` Thierry Reding 2021-03-22 14:48 ` Dmitry Osipenko 2021-03-22 14:48 ` Dmitry Osipenko 2021-03-22 15:19 ` Mikko Perttunen 2021-03-22 15:19 ` Mikko Perttunen 2021-03-22 16:01 ` Dmitry Osipenko 2021-03-22 16:01 ` Dmitry Osipenko 2021-03-23 10:20 ` Thierry Reding 2021-03-23 10:20 ` Thierry Reding 2021-03-23 13:25 ` Dmitry Osipenko 2021-03-23 13:25 ` Dmitry Osipenko 2021-03-26 14:54 ` Mikko Perttunen 2021-03-26 14:54 ` Mikko Perttunen 2021-03-26 18:31 ` Dmitry Osipenko 2021-03-26 18:31 ` Dmitry Osipenko 2021-03-26 19:10 ` Mikko Perttunen 2021-03-26 19:10 ` Mikko Perttunen 2021-03-26 22:47 ` Dmitry Osipenko 2021-03-26 22:47 ` Dmitry Osipenko 2021-01-11 13:00 ` [PATCH v5 02/21] gpu: host1x: Allow syncpoints without associated client Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 10:10 ` Thierry Reding 2021-03-23 10:10 ` Thierry Reding 2021-03-23 10:32 ` Mikko Perttunen 2021-03-23 10:32 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 03/21] gpu: host1x: Show number of pending waiters in debugfs Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 10:16 ` Thierry Reding 2021-03-23 10:16 ` Thierry Reding 2021-03-26 14:34 ` Mikko Perttunen 2021-03-26 14:34 ` Mikko Perttunen 2021-04-01 21:19 ` Michał Mirosław 2021-04-01 21:19 ` Michał Mirosław 2021-04-02 16:02 ` Dmitry Osipenko 2021-04-02 16:02 ` Dmitry Osipenko 2021-04-08 4:13 ` Michał Mirosław 2021-04-08 4:13 ` Michał Mirosław 2021-04-08 4:25 ` Michał Mirosław 2021-04-08 4:25 ` Michał Mirosław 2021-04-08 11:58 ` Mikko Perttunen 2021-04-08 11:58 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 04/21] gpu: host1x: Remove cancelled waiters immediately Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-12 22:07 ` Dmitry Osipenko 2021-01-12 22:07 ` Dmitry Osipenko 2021-01-12 22:20 ` Mikko Perttunen 2021-01-12 22:20 ` Mikko Perttunen 2021-01-13 16:29 ` Dmitry Osipenko 2021-01-13 16:29 ` Dmitry Osipenko 2021-01-13 18:16 ` Mikko Perttunen 2021-01-13 18:16 ` Mikko Perttunen 2021-03-23 10:23 ` Thierry Reding 2021-03-23 10:23 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 05/21] gpu: host1x: Use HW-equivalent syncpoint expiration check Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 10:26 ` Thierry Reding 2021-03-23 10:26 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 06/21] gpu: host1x: Cleanup and refcounting for syncpoints Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 10:36 ` Thierry Reding 2021-03-23 10:36 ` Thierry Reding 2021-03-23 10:44 ` Mikko Perttunen 2021-03-23 10:44 ` Mikko Perttunen 2021-03-23 11:21 ` Thierry Reding 2021-03-23 11:21 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 07/21] gpu: host1x: Introduce UAPI header Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 10:52 ` Thierry Reding 2021-03-23 10:52 ` Thierry Reding 2021-03-23 11:12 ` Mikko Perttunen 2021-03-23 11:12 ` Mikko Perttunen 2021-03-23 11:43 ` Thierry Reding 2021-03-23 11:43 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 08/21] gpu: host1x: Implement /dev/host1x device node Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 11:02 ` Thierry Reding 2021-03-23 11:02 ` Thierry Reding 2021-03-23 11:15 ` Mikko Perttunen 2021-03-23 11:15 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 09/21] gpu: host1x: DMA fences and userspace fence creation Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 11:15 ` Thierry Reding 2021-03-23 11:15 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 10/21] gpu: host1x: Add no-recovery mode Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 11/21] gpu: host1x: Add job release callback Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 11:55 ` Thierry Reding 2021-03-23 11:55 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 12/21] gpu: host1x: Add support for syncpoint waits in CDMA pushbuffer Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 13/21] gpu: host1x: Reset max value when freeing a syncpoint Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 14/21] gpu: host1x: Reserve VBLANK syncpoints at initialization Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 15/21] drm/tegra: Add new UAPI to header Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-13 18:14 ` Dmitry Osipenko 2021-01-13 18:14 ` Dmitry Osipenko 2021-01-13 18:56 ` Mikko Perttunen 2021-01-13 18:56 ` Mikko Perttunen 2021-01-14 8:36 ` Dmitry Osipenko 2021-01-14 8:36 ` Dmitry Osipenko 2021-01-14 10:34 ` Mikko Perttunen 2021-01-14 10:34 ` Mikko Perttunen 2021-03-23 12:30 ` Thierry Reding 2021-03-23 12:30 ` Thierry Reding 2021-03-23 14:00 ` Dmitry Osipenko 2021-03-23 14:00 ` Dmitry Osipenko 2021-03-23 16:44 ` Thierry Reding 2021-03-23 16:44 ` Thierry Reding 2021-03-23 17:32 ` Dmitry Osipenko 2021-03-23 17:32 ` Dmitry Osipenko 2021-03-23 17:57 ` Thierry Reding 2021-03-23 17:57 ` Thierry Reding 2021-01-11 13:00 ` Mikko Perttunen [this message] 2021-01-11 13:00 ` [PATCH v5 16/21] drm/tegra: Boot VIC during runtime PM resume Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 17/21] drm/tegra: Set resv fields when importing/exporting GEMs Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 18/21] drm/tegra: Allocate per-engine channel in core code Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 12:35 ` Thierry Reding 2021-03-23 12:35 ` Thierry Reding 2021-03-23 13:15 ` Mikko Perttunen 2021-03-23 13:15 ` Mikko Perttunen 2021-01-11 13:00 ` [PATCH v5 19/21] drm/tegra: Implement new UAPI Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-11 17:37 ` kernel test robot 2021-01-11 17:37 ` kernel test robot 2021-01-11 17:37 ` kernel test robot 2021-01-12 22:27 ` Dmitry Osipenko 2021-01-12 22:27 ` Dmitry Osipenko 2021-03-23 13:25 ` Thierry Reding 2021-03-23 13:25 ` Thierry Reding 2021-03-23 14:43 ` Mikko Perttunen 2021-03-23 14:43 ` Mikko Perttunen 2021-03-23 15:00 ` Dmitry Osipenko 2021-03-23 15:00 ` Dmitry Osipenko 2021-03-23 16:59 ` Thierry Reding 2021-03-23 16:59 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 20/21] drm/tegra: Implement job submission part of " Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-03-23 13:38 ` Thierry Reding 2021-03-23 13:38 ` Thierry Reding 2021-03-23 14:16 ` Mikko Perttunen 2021-03-23 14:16 ` Mikko Perttunen 2021-03-23 17:04 ` Thierry Reding 2021-03-23 17:04 ` Thierry Reding 2021-01-11 13:00 ` [PATCH v5 21/21] drm/tegra: Add job firewall Mikko Perttunen 2021-01-11 13:00 ` Mikko Perttunen 2021-01-19 22:29 ` [PATCH v5 00/21] Host1x/TegraDRM UAPI Dmitry Osipenko 2021-01-19 22:29 ` Dmitry Osipenko 2021-01-26 2:45 ` Mikko Perttunen 2021-01-26 2:45 ` Mikko Perttunen 2021-01-27 21:20 ` [PATCH v5 00/21] Host1x sync point UAPI should not be used for tracking DRM jobs Dmitry Osipenko 2021-01-27 21:20 ` Dmitry Osipenko 2021-01-28 11:08 ` Mikko Perttunen 2021-01-28 11:08 ` Mikko Perttunen 2021-01-28 16:58 ` Thierry Reding 2021-01-28 16:58 ` Thierry Reding 2021-01-29 17:30 ` Dmitry Osipenko 2021-01-29 17:30 ` Dmitry Osipenko 2021-02-03 11:18 ` Mikko Perttunen 2021-02-03 11:18 ` Mikko Perttunen 2021-02-27 11:19 ` Dmitry Osipenko 2021-02-27 11:19 ` Dmitry Osipenko 2021-03-01 8:19 ` Mikko Perttunen 2021-03-01 8:19 ` Mikko Perttunen 2021-03-23 18:21 ` Thierry Reding 2021-03-23 18:21 ` Thierry Reding 2021-03-23 19:57 ` Dmitry Osipenko 2021-03-23 19:57 ` Dmitry Osipenko 2021-03-23 20:13 ` Dmitry Osipenko 2021-03-23 20:13 ` Dmitry Osipenko 2021-01-27 21:26 ` [PATCH v5 00/21] Host1x/TegraDRM UAPI Dmitry Osipenko 2021-01-27 21:26 ` Dmitry Osipenko 2021-01-27 21:57 ` Mikko Perttunen 2021-01-27 21:57 ` Mikko Perttunen 2021-01-27 22:06 ` Dmitry Osipenko 2021-01-27 22:06 ` Dmitry Osipenko 2021-01-28 11:46 ` Mikko Perttunen 2021-01-28 11:46 ` Mikko Perttunen 2021-01-27 21:35 ` [PATCH v5 00/21] sync_file API is not very suitable for DRM Dmitry Osipenko 2021-01-27 21:35 ` Dmitry Osipenko 2021-01-27 21:53 ` Mikko Perttunen 2021-01-27 21:53 ` Mikko Perttunen 2021-01-27 22:26 ` Dmitry Osipenko 2021-01-27 22:26 ` Dmitry Osipenko 2021-01-27 21:52 ` [PATCH v5 00/21] support option where all commands are collected into a single,dedicated cmdstream Dmitry Osipenko 2021-01-27 21:52 ` Dmitry Osipenko
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=20210111130019.3515669-17-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.