* [PATCH v2] drm/vc4: Unselect PM
@ 2021-09-24 15:23 Maxime Ripard
2021-09-24 15:46 ` Nathan Chancellor
2021-09-24 20:41 ` Randy Dunlap
0 siblings, 2 replies; 3+ messages in thread
From: Maxime Ripard @ 2021-09-24 15:23 UTC (permalink / raw)
To: Maarten Lankhorst, Thomas Zimmermann, Maxime Ripard,
Daniel Vetter, David Airlie
Cc: Linus Torvalds, linux-rpi-kernel, Florian Fainelli,
Nicolas Saenz Julienne, linux-arm-kernel, Nathan Chancellor,
Randy Dunlap, Stephen Rothwell
It turns out we can't select PM when allowing the compilation for
COMPILE_TEST. Indeed, PM might not be defined at all, or come with extra
requirements we can't meet.
This select was initially introduced since we need to call the
vc4_hdmi_runtime_resume() at probe time to make sure our device is
properly powered at bind time, no matter whether PM is there or not, and
we needed to make sure we didn't have a defined but not used warning for
vc4_hdmi_runtime_suspend().
This will still happen on platforms that don't define PM though, since
SET_RUNTIME_PM_OPS will then be a nop. In order to fix both issues,
let's remove the select, and add a __maybe_unused attribute to
vc4_hdmi_runtime_resume().
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
I'm not sure how to merge this one, since this commit has been reverted
in Linus tree, and un-reverted in linux-next. Should we wait a bit until
the reworked version of the original commit has been merged again?
Maxime
Changes from v1:
- remove select
- add __maybe_unused to vc4_hdmi_runtime_resume
- reword the commit log
---
drivers/gpu/drm/vc4/Kconfig | 1 -
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
index 52a1c309cb4a..345a5570a3da 100644
--- a/drivers/gpu/drm/vc4/Kconfig
+++ b/drivers/gpu/drm/vc4/Kconfig
@@ -9,7 +9,6 @@ config DRM_VC4
select DRM_KMS_CMA_HELPER
select DRM_GEM_CMA_HELPER
select DRM_PANEL_BRIDGE
- select PM
select SND_PCM
select SND_PCM_ELD
select SND_SOC_GENERIC_DMAENGINE_PCM
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 500cdd56b335..1f2690ed8542 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -2122,7 +2122,7 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
return 0;
}
-static int vc4_hdmi_runtime_suspend(struct device *dev)
+static int __maybe_unused vc4_hdmi_runtime_suspend(struct device *dev)
{
struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/vc4: Unselect PM
2021-09-24 15:23 [PATCH v2] drm/vc4: Unselect PM Maxime Ripard
@ 2021-09-24 15:46 ` Nathan Chancellor
2021-09-24 20:41 ` Randy Dunlap
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2021-09-24 15:46 UTC (permalink / raw)
To: Maxime Ripard
Cc: Maarten Lankhorst, Thomas Zimmermann, Daniel Vetter,
David Airlie, Linus Torvalds, linux-rpi-kernel, Florian Fainelli,
Nicolas Saenz Julienne, linux-arm-kernel, Randy Dunlap,
Stephen Rothwell
On Fri, Sep 24, 2021 at 05:23:34PM +0200, Maxime Ripard wrote:
> It turns out we can't select PM when allowing the compilation for
> COMPILE_TEST. Indeed, PM might not be defined at all, or come with extra
> requirements we can't meet.
>
> This select was initially introduced since we need to call the
> vc4_hdmi_runtime_resume() at probe time to make sure our device is
> properly powered at bind time, no matter whether PM is there or not, and
> we needed to make sure we didn't have a defined but not used warning for
> vc4_hdmi_runtime_suspend().
>
> This will still happen on platforms that don't define PM though, since
> SET_RUNTIME_PM_OPS will then be a nop. In order to fix both issues,
> let's remove the select, and add a __maybe_unused attribute to
> vc4_hdmi_runtime_resume().
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org> # build
> ---
>
> I'm not sure how to merge this one, since this commit has been reverted
> in Linus tree, and un-reverted in linux-next. Should we wait a bit until
> the reworked version of the original commit has been merged again?
>
> Maxime
>
> Changes from v1:
> - remove select
> - add __maybe_unused to vc4_hdmi_runtime_resume
> - reword the commit log
> ---
> drivers/gpu/drm/vc4/Kconfig | 1 -
> drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
> index 52a1c309cb4a..345a5570a3da 100644
> --- a/drivers/gpu/drm/vc4/Kconfig
> +++ b/drivers/gpu/drm/vc4/Kconfig
> @@ -9,7 +9,6 @@ config DRM_VC4
> select DRM_KMS_CMA_HELPER
> select DRM_GEM_CMA_HELPER
> select DRM_PANEL_BRIDGE
> - select PM
> select SND_PCM
> select SND_PCM_ELD
> select SND_SOC_GENERIC_DMAENGINE_PCM
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 500cdd56b335..1f2690ed8542 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -2122,7 +2122,7 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
> return 0;
> }
>
> -static int vc4_hdmi_runtime_suspend(struct device *dev)
> +static int __maybe_unused vc4_hdmi_runtime_suspend(struct device *dev)
> {
> struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
>
> --
> 2.31.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/vc4: Unselect PM
2021-09-24 15:23 [PATCH v2] drm/vc4: Unselect PM Maxime Ripard
2021-09-24 15:46 ` Nathan Chancellor
@ 2021-09-24 20:41 ` Randy Dunlap
1 sibling, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2021-09-24 20:41 UTC (permalink / raw)
To: Maxime Ripard, Maarten Lankhorst, Thomas Zimmermann,
Daniel Vetter, David Airlie
Cc: Linus Torvalds, linux-rpi-kernel, Florian Fainelli,
Nicolas Saenz Julienne, linux-arm-kernel, Nathan Chancellor,
Stephen Rothwell
On 9/24/21 8:23 AM, Maxime Ripard wrote:
> It turns out we can't select PM when allowing the compilation for
> COMPILE_TEST. Indeed, PM might not be defined at all, or come with extra
> requirements we can't meet.
>
> This select was initially introduced since we need to call the
> vc4_hdmi_runtime_resume() at probe time to make sure our device is
> properly powered at bind time, no matter whether PM is there or not, and
> we needed to make sure we didn't have a defined but not used warning for
> vc4_hdmi_runtime_suspend().
>
> This will still happen on platforms that don't define PM though, since
> SET_RUNTIME_PM_OPS will then be a nop. In order to fix both issues,
> let's remove the select, and add a __maybe_unused attribute to
> vc4_hdmi_runtime_resume().
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
>
LGTM. Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> ---
>
> I'm not sure how to merge this one, since this commit has been reverted
> in Linus tree, and un-reverted in linux-next. Should we wait a bit until
> the reworked version of the original commit has been merged again?
>
> Maxime
>
> Changes from v1:
> - remove select
> - add __maybe_unused to vc4_hdmi_runtime_resume
> - reword the commit log
> ---
> drivers/gpu/drm/vc4/Kconfig | 1 -
> drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
> index 52a1c309cb4a..345a5570a3da 100644
> --- a/drivers/gpu/drm/vc4/Kconfig
> +++ b/drivers/gpu/drm/vc4/Kconfig
> @@ -9,7 +9,6 @@ config DRM_VC4
> select DRM_KMS_CMA_HELPER
> select DRM_GEM_CMA_HELPER
> select DRM_PANEL_BRIDGE
> - select PM
> select SND_PCM
> select SND_PCM_ELD
> select SND_SOC_GENERIC_DMAENGINE_PCM
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 500cdd56b335..1f2690ed8542 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -2122,7 +2122,7 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
> return 0;
> }
>
> -static int vc4_hdmi_runtime_suspend(struct device *dev)
> +static int __maybe_unused vc4_hdmi_runtime_suspend(struct device *dev)
> {
> struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
>
>
--
~Randy
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-24 20:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-24 15:23 [PATCH v2] drm/vc4: Unselect PM Maxime Ripard
2021-09-24 15:46 ` Nathan Chancellor
2021-09-24 20:41 ` Randy Dunlap
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.