| Message ID | c925832c-2420-10f4-4510-a236384181de@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 21/12/2017 20:41, Heiner Kallweit wrote: > When operating the system headless headless, the domain is never > powered on, leaving the clocks disabled. The shutdown function then > tries to disable the already disabled clocks, resulting in errors. > Therefore call meson_gx_pwrc_vpu_power_off() only if domain is > powered on. > This patch fixes the described issue on my system (Odorid-C2). > > Fixes: 339cd0ea0822 "soc: amlogic: meson-gx-pwrc-vpu: fix power-off when powered by bootloader" > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > index 3adb2f2ec..6289965c4 100644 > --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c > @@ -225,7 +225,11 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) > > static void meson_gx_pwrc_vpu_shutdown(struct platform_device *pdev) > { > - meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd); > + bool powered_off; > + > + powered_off = meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd); > + if (!powered_off) > + meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd); > } > > static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = { > Ok, this occurs using mainline U-Boot, but with Meson DRM driver disabled, this use case should be covered. Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c index 3adb2f2ec..6289965c4 100644 --- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c +++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c @@ -225,7 +225,11 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) static void meson_gx_pwrc_vpu_shutdown(struct platform_device *pdev) { - meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd); + bool powered_off; + + powered_off = meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd); + if (!powered_off) + meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd); } static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = {
When operating the system headless headless, the domain is never powered on, leaving the clocks disabled. The shutdown function then tries to disable the already disabled clocks, resulting in errors. Therefore call meson_gx_pwrc_vpu_power_off() only if domain is powered on. This patch fixes the described issue on my system (Odorid-C2). Fixes: 339cd0ea0822 "soc: amlogic: meson-gx-pwrc-vpu: fix power-off when powered by bootloader" Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)