From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jonathan Hunter <jonathanh@nvidia.com>, Paul Cercueil <paul@crapouillou.net>, Thierry Reding <thierry.reding@gmail.com>, linux-tegra@vger.kernel.org Subject: [PATCH v2 05/26] drm: tegra: Define and use generic PM ops Date: Tue, 29 Nov 2022 19:17:12 +0000 [thread overview] Message-ID: <20221129191733.137897-6-paul@crapouillou.net> (raw) In-Reply-To: <20221129191733.137897-1-paul@crapouillou.net> Use the new DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro to create a "struct dev_pm_ops" that can be used by this driver, instead of using custom PM callbacks with the same behaviour. v2: Use the DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro instead of an exported dev_pm_ops. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/tegra/drm.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index a1f909dac89a..c844444ff522 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1329,25 +1329,6 @@ static int host1x_drm_remove(struct host1x_device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int host1x_drm_suspend(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_suspend(drm); -} - -static int host1x_drm_resume(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_resume(drm); -} -#endif - -static SIMPLE_DEV_PM_OPS(host1x_drm_pm_ops, host1x_drm_suspend, - host1x_drm_resume); - static const struct of_device_id host1x_drm_subdevs[] = { { .compatible = "nvidia,tegra20-dc", }, { .compatible = "nvidia,tegra20-hdmi", }, @@ -1389,10 +1370,12 @@ static const struct of_device_id host1x_drm_subdevs[] = { { /* sentinel */ } }; +DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS(tegra_pm_ops); + static struct host1x_driver host1x_drm_driver = { .driver = { .name = "drm", - .pm = &host1x_drm_pm_ops, + .pm = pm_sleep_ptr(&tegra_pm_ops), }, .probe = host1x_drm_probe, .remove = host1x_drm_remove, -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, linux-tegra@vger.kernel.org Subject: [PATCH v2 05/26] drm: tegra: Define and use generic PM ops Date: Tue, 29 Nov 2022 19:17:12 +0000 [thread overview] Message-ID: <20221129191733.137897-6-paul@crapouillou.net> (raw) In-Reply-To: <20221129191733.137897-1-paul@crapouillou.net> Use the new DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro to create a "struct dev_pm_ops" that can be used by this driver, instead of using custom PM callbacks with the same behaviour. v2: Use the DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro instead of an exported dev_pm_ops. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/tegra/drm.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index a1f909dac89a..c844444ff522 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1329,25 +1329,6 @@ static int host1x_drm_remove(struct host1x_device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int host1x_drm_suspend(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_suspend(drm); -} - -static int host1x_drm_resume(struct device *dev) -{ - struct drm_device *drm = dev_get_drvdata(dev); - - return drm_mode_config_helper_resume(drm); -} -#endif - -static SIMPLE_DEV_PM_OPS(host1x_drm_pm_ops, host1x_drm_suspend, - host1x_drm_resume); - static const struct of_device_id host1x_drm_subdevs[] = { { .compatible = "nvidia,tegra20-dc", }, { .compatible = "nvidia,tegra20-hdmi", }, @@ -1389,10 +1370,12 @@ static const struct of_device_id host1x_drm_subdevs[] = { { /* sentinel */ } }; +DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS(tegra_pm_ops); + static struct host1x_driver host1x_drm_driver = { .driver = { .name = "drm", - .pm = &host1x_drm_pm_ops, + .pm = pm_sleep_ptr(&tegra_pm_ops), }, .probe = host1x_drm_probe, .remove = host1x_drm_remove, -- 2.35.1
next prev parent reply other threads:[~2022-11-29 19:18 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-29 19:17 [PATCH v2 00/26] drm: Get rid of #ifdef CONFIG_PM* guards Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 01/26] drm: modeset-helper: Add DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS macro Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 02/26] drm: bochs: Define and use generic PM ops Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 03/26] drm: imx: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 04/26] drm: rockchip: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil [this message] 2022-11-29 19:17 ` [PATCH v2 05/26] drm: tegra: " Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 06/26] drm: sun4i: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-30 4:08 ` Samuel Holland 2022-11-30 4:08 ` Samuel Holland 2022-11-30 4:08 ` Samuel Holland 2022-11-29 19:17 ` [PATCH v2 07/26] drm: mxsfb: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 21:48 ` Marek Vasut 2022-11-29 21:48 ` Marek Vasut 2022-11-29 21:48 ` Marek Vasut 2022-11-29 19:17 ` [PATCH v2 08/26] drm: atmel-hlcdc: Remove #ifdef guards for PM related functions Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 09/26] drm: exynos: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 10/26] drm: imx/dcss: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 11/26] drm: bridge/dw-hdmi: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 12/26] drm: etnaviv: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-12-15 19:22 ` Lucas Stach 2022-12-15 19:22 ` Lucas Stach 2022-11-29 19:17 ` [PATCH v2 13/26] drm: fsl-dcu: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 14/26] drm: mediatek: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 15/26] drm: omap: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 16/26] drm: panfrost: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:54 ` Alyssa Rosenzweig 2022-11-29 19:54 ` Alyssa Rosenzweig 2022-11-29 19:19 ` [PATCH v2 17/26] drm: rcar-du: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:43 ` Laurent Pinchart 2022-11-29 19:43 ` Laurent Pinchart 2022-11-29 21:05 ` Paul Cercueil 2022-11-29 21:05 ` Paul Cercueil 2022-11-29 21:24 ` Laurent Pinchart 2022-11-29 21:24 ` Laurent Pinchart 2022-11-29 19:19 ` [PATCH v2 18/26] drm: rockchip: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 19/26] drm: shmobile: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:44 ` Laurent Pinchart 2022-11-29 19:44 ` Laurent Pinchart 2022-11-29 19:19 ` [PATCH v2 20/26] drm: tegra: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 21/26] drm: tilcdc: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 22/26] drm: vboxvideo: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 23/26] drm: vc4: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 24/26] drm: gm12u320: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 25/26] drm: tidss: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 26/26] drm/i915/gt: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [Intel-gfx] " Paul Cercueil 2022-12-07 15:56 ` Rodrigo Vivi 2022-12-07 15:56 ` Rodrigo Vivi 2022-12-07 15:56 ` Rodrigo Vivi
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=20221129191733.137897-6-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=airlied@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=jonathanh@nvidia.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --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.