From: Geert Uytterhoeven <geert+renesas@glider.be> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Thomas Zimmermann <tzimmermann@suse.de>, Magnus Damm <magnus.damm@gmail.com> Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v2 07/41] drm: renesas: shmobile: Add support for Runtime PM Date: Tue, 18 Jul 2023 18:54:12 +0200 [thread overview] Message-ID: <ceb3a14c618335258e8caa95c8b0dd2e2229b927.1689698048.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1689698048.git.geert+renesas@glider.be> The SH-Mobile LCD Controller is part of a PM Domain on all relevant SoCs (clock domain on all, power domain on some). Hence it may not be sufficient to manage the LCDC module clock explicitly (e.g. if the selected clock source differs from SHMOB_DRM_CLK_BUS). Fix this by using Runtime PM for all clock handling. Add an explicit dependency on CONFIG_PM, which should already be met on all affected platforms. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - Move explicit clock handling to Runtime PM callbacks, - Move devm_pm_runtime_enable() after shmob_drm_setup_clocks(), - Depend on PM. --- drivers/gpu/drm/renesas/shmobile/Kconfig | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 32 ++-------------- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 38 +++++++++++++++++-- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/Kconfig b/drivers/gpu/drm/renesas/shmobile/Kconfig index ad14112999ad8aba..ba941587ca70e08c 100644 --- a/drivers/gpu/drm/renesas/shmobile/Kconfig +++ b/drivers/gpu/drm/renesas/shmobile/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config DRM_SHMOBILE tristate "DRM Support for SH Mobile" - depends on DRM + depends on DRM && PM depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index fbfd906844da490c..2d9ae0c6ab7b18a8 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -9,6 +9,7 @@ #include <linux/backlight.h> #include <linux/clk.h> +#include <linux/pm_runtime.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> @@ -34,29 +35,6 @@ * TODO: panel support */ -/* ----------------------------------------------------------------------------- - * Clock management - */ - -static int shmob_drm_clk_on(struct shmob_drm_device *sdev) -{ - int ret; - - if (sdev->clock) { - ret = clk_prepare_enable(sdev->clock); - if (ret < 0) - return ret; - } - - return 0; -} - -static void shmob_drm_clk_off(struct shmob_drm_device *sdev) -{ - if (sdev->clock) - clk_disable_unprepare(sdev->clock); -} - /* ----------------------------------------------------------------------------- * CRTC */ @@ -170,9 +148,8 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) if (WARN_ON(format == NULL)) return; - /* Enable clocks before accessing the hardware. */ - ret = shmob_drm_clk_on(sdev); - if (ret < 0) + ret = pm_runtime_resume_and_get(sdev->dev); + if (ret) return; /* Reset and enable the LCDC. */ @@ -268,8 +245,7 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) /* Disable the display output. */ lcdc_write(sdev, LDCNT1R, 0); - /* Stop clocks. */ - shmob_drm_clk_off(sdev); + pm_runtime_put(sdev->dev); scrtc->started = false; } diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 30493ce874192e3e..3fc7d820abdc61d4 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <drm/drm_drv.h> @@ -165,8 +166,35 @@ static int shmob_drm_pm_resume(struct device *dev) return 0; } -static DEFINE_SIMPLE_DEV_PM_OPS(shmob_drm_pm_ops, - shmob_drm_pm_suspend, shmob_drm_pm_resume); +static int shmob_drm_pm_runtime_suspend(struct device *dev) +{ + struct shmob_drm_device *sdev = dev_get_drvdata(dev); + + if (sdev->clock) + clk_disable_unprepare(sdev->clock); + + return 0; +} + +static int shmob_drm_pm_runtime_resume(struct device *dev) +{ + struct shmob_drm_device *sdev = dev_get_drvdata(dev); + int ret; + + if (sdev->clock) { + ret = clk_prepare_enable(sdev->clock); + if (ret < 0) + return ret; + } + + return 0; +} + +static const struct dev_pm_ops shmob_drm_pm_ops = { + SYSTEM_SLEEP_PM_OPS(shmob_drm_pm_suspend, shmob_drm_pm_resume) + RUNTIME_PM_OPS(shmob_drm_pm_runtime_suspend, + shmob_drm_pm_runtime_resume, NULL) +}; /* ----------------------------------------------------------------------------- * Platform driver @@ -220,6 +248,10 @@ static int shmob_drm_probe(struct platform_device *pdev) if (ret < 0) return ret; + ret = devm_pm_runtime_enable(&pdev->dev); + if (ret) + return ret; + ret = shmob_drm_init_interface(sdev); if (ret < 0) return ret; @@ -291,7 +323,7 @@ static struct platform_driver shmob_drm_platform_driver = { .remove = shmob_drm_remove, .driver = { .name = "shmob-drm", - .pm = pm_sleep_ptr(&shmob_drm_pm_ops), + .pm = &shmob_drm_pm_ops, }, }; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Thomas Zimmermann <tzimmermann@suse.de>, Magnus Damm <magnus.damm@gmail.com> Cc: linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 07/41] drm: renesas: shmobile: Add support for Runtime PM Date: Tue, 18 Jul 2023 18:54:12 +0200 [thread overview] Message-ID: <ceb3a14c618335258e8caa95c8b0dd2e2229b927.1689698048.git.geert+renesas@glider.be> (raw) In-Reply-To: <cover.1689698048.git.geert+renesas@glider.be> The SH-Mobile LCD Controller is part of a PM Domain on all relevant SoCs (clock domain on all, power domain on some). Hence it may not be sufficient to manage the LCDC module clock explicitly (e.g. if the selected clock source differs from SHMOB_DRM_CLK_BUS). Fix this by using Runtime PM for all clock handling. Add an explicit dependency on CONFIG_PM, which should already be met on all affected platforms. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - Move explicit clock handling to Runtime PM callbacks, - Move devm_pm_runtime_enable() after shmob_drm_setup_clocks(), - Depend on PM. --- drivers/gpu/drm/renesas/shmobile/Kconfig | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 32 ++-------------- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 38 +++++++++++++++++-- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/Kconfig b/drivers/gpu/drm/renesas/shmobile/Kconfig index ad14112999ad8aba..ba941587ca70e08c 100644 --- a/drivers/gpu/drm/renesas/shmobile/Kconfig +++ b/drivers/gpu/drm/renesas/shmobile/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config DRM_SHMOBILE tristate "DRM Support for SH Mobile" - depends on DRM + depends on DRM && PM depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index fbfd906844da490c..2d9ae0c6ab7b18a8 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -9,6 +9,7 @@ #include <linux/backlight.h> #include <linux/clk.h> +#include <linux/pm_runtime.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> @@ -34,29 +35,6 @@ * TODO: panel support */ -/* ----------------------------------------------------------------------------- - * Clock management - */ - -static int shmob_drm_clk_on(struct shmob_drm_device *sdev) -{ - int ret; - - if (sdev->clock) { - ret = clk_prepare_enable(sdev->clock); - if (ret < 0) - return ret; - } - - return 0; -} - -static void shmob_drm_clk_off(struct shmob_drm_device *sdev) -{ - if (sdev->clock) - clk_disable_unprepare(sdev->clock); -} - /* ----------------------------------------------------------------------------- * CRTC */ @@ -170,9 +148,8 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) if (WARN_ON(format == NULL)) return; - /* Enable clocks before accessing the hardware. */ - ret = shmob_drm_clk_on(sdev); - if (ret < 0) + ret = pm_runtime_resume_and_get(sdev->dev); + if (ret) return; /* Reset and enable the LCDC. */ @@ -268,8 +245,7 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) /* Disable the display output. */ lcdc_write(sdev, LDCNT1R, 0); - /* Stop clocks. */ - shmob_drm_clk_off(sdev); + pm_runtime_put(sdev->dev); scrtc->started = false; } diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 30493ce874192e3e..3fc7d820abdc61d4 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <drm/drm_drv.h> @@ -165,8 +166,35 @@ static int shmob_drm_pm_resume(struct device *dev) return 0; } -static DEFINE_SIMPLE_DEV_PM_OPS(shmob_drm_pm_ops, - shmob_drm_pm_suspend, shmob_drm_pm_resume); +static int shmob_drm_pm_runtime_suspend(struct device *dev) +{ + struct shmob_drm_device *sdev = dev_get_drvdata(dev); + + if (sdev->clock) + clk_disable_unprepare(sdev->clock); + + return 0; +} + +static int shmob_drm_pm_runtime_resume(struct device *dev) +{ + struct shmob_drm_device *sdev = dev_get_drvdata(dev); + int ret; + + if (sdev->clock) { + ret = clk_prepare_enable(sdev->clock); + if (ret < 0) + return ret; + } + + return 0; +} + +static const struct dev_pm_ops shmob_drm_pm_ops = { + SYSTEM_SLEEP_PM_OPS(shmob_drm_pm_suspend, shmob_drm_pm_resume) + RUNTIME_PM_OPS(shmob_drm_pm_runtime_suspend, + shmob_drm_pm_runtime_resume, NULL) +}; /* ----------------------------------------------------------------------------- * Platform driver @@ -220,6 +248,10 @@ static int shmob_drm_probe(struct platform_device *pdev) if (ret < 0) return ret; + ret = devm_pm_runtime_enable(&pdev->dev); + if (ret) + return ret; + ret = shmob_drm_init_interface(sdev); if (ret < 0) return ret; @@ -291,7 +323,7 @@ static struct platform_driver shmob_drm_platform_driver = { .remove = shmob_drm_remove, .driver = { .name = "shmob-drm", - .pm = pm_sleep_ptr(&shmob_drm_pm_ops), + .pm = &shmob_drm_pm_ops, }, }; -- 2.34.1
next prev parent reply other threads:[~2023-07-18 16:55 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-18 16:54 [PATCH v2 00/41] drm: renesas: shmobile: Atomic conversion + DT support Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 01/41] MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 02/41] dt-bindings: display: Add Renesas SH-Mobile LCDC bindings Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-19 22:08 ` Rob Herring 2023-07-19 22:08 ` Rob Herring 2023-07-18 16:54 ` [PATCH v2 03/41] media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 04/41] drm: renesas: shmobile: Fix overlay plane disable Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 05/41] drm: renesas: shmobile: Fix ARGB32 overlay format typo Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 06/41] drm: renesas: shmobile: Correct encoder/connector types Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven [this message] 2023-07-18 16:54 ` [PATCH v2 07/41] drm: renesas: shmobile: Add support for Runtime PM Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 08/41] drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks() Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 09/41] drm: renesas: shmobile: Use %p4cc to print fourcc code Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 10/41] drm: renesas: shmobile: Add missing YCbCr formats Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 11/41] drm: renesas: shmobile: Improve shmob_drm_format_info table Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 12/41] drm: renesas: shmobile: Remove backlight support Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 13/41] drm: renesas: shmobile: Don't set display info width and height twice Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 14/41] drm: renesas: shmobile: Rename input clocks Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 15/41] drm: renesas: shmobile: Remove support for SYS panels Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 16/41] drm: renesas: shmobile: Improve error handling Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 17/41] drm: renesas: shmobile: Convert to use devm_request_irq() Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 19/41] drm: renesas: shmobile: Use drmm_universal_plane_alloc() Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 20/41] drm: renesas: shmobile: Embed drm_device in shmob_drm_device Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 21/41] drm: renesas: shmobile: Convert container helpers to static inline functions Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 22/41] drm: renesas: shmobile: Replace .dev_private with container_of() Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 23/41] drm: renesas: shmobile: Use struct videomode in platform data Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 24/41] drm: renesas: shmobile: Use media bus formats " Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 25/41] drm: renesas: shmobile: Move interface handling to connector setup Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 26/41] drm: renesas: shmobile: Unify plane allocation Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 27/41] drm: renesas: shmobile: Rename shmob_drm_crtc.crtc Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 28/41] drm: renesas: shmobile: Rename shmob_drm_connector.connector Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 29/41] drm: renesas: shmobile: Rename shmob_drm_plane.plane Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 30/41] drm: renesas: shmobile: Use drm_crtc_handle_vblank() Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 31/41] drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip() Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 32/41] drm: renesas: shmobile: Wait for page flip when turning CRTC off Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 33/41] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 34/41] drm: renesas: shmobile: Shutdown the display on remove Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 35/41] drm: renesas: shmobile: Cleanup encoder Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 36/41] drm: renesas: shmobile: Atomic conversion part 1 Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 37/41] drm: renesas: shmobile: Atomic conversion part 2 Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 38/41] drm: renesas: shmobile: Use suspend/resume helpers Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 39/41] drm: renesas: shmobile: Remove internal CRTC state tracking Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 40/41] drm: renesas: shmobile: Atomic conversion part 3 Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven 2023-07-18 16:54 ` [PATCH v2 41/41] drm: renesas: shmobile: Add DT support Geert Uytterhoeven 2023-07-18 16:54 ` Geert Uytterhoeven
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=ceb3a14c618335258e8caa95c8b0dd2e2229b927.1689698048.git.geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=airlied@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=tzimmermann@suse.de \ /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.