From: Boris Brezillon <boris.brezillon@collabora.com>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: linux-media@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
Ezequiel Garcia <ezequiel@collabora.com>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
Jonas Karlman <jonas@kwiboo.se>,
devicetree@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH v2 3/9] media: hantro: add PM runtime resume callback
Date: Wed, 29 May 2019 13:18:14 +0200 [thread overview]
Message-ID: <20190529131814.6d8d14cc@collabora.com> (raw)
In-Reply-To: <20190529095424.23614-4-p.zabel@pengutronix.de>
On Wed, 29 May 2019 11:54:18 +0200
Philipp Zabel <p.zabel@pengutronix.de> wrote:
> It seems that on i.MX8MQ the power domain controller does not propagate
> resets to the VPU cores on resume. Add a callback to allow implementing
> manual reset of the VPU cores after ungating the power domain.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
> drivers/staging/media/hantro/hantro.h | 2 ++
> drivers/staging/media/hantro/hantro_drv.c | 13 +++++++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h
> index 14e685428203..296b9ffad547 100644
> --- a/drivers/staging/media/hantro/hantro.h
> +++ b/drivers/staging/media/hantro/hantro.h
> @@ -56,6 +56,7 @@ struct hantro_codec_ops;
> * @codec: Supported codecs
> * @codec_ops: Codec ops.
> * @init: Initialize hardware.
> + * @runtime_resume: reenable hardware after power gating
> * @vepu_irq: encoder interrupt handler
> * @vdpu_irq: decoder interrupt handler
> * @clk_names: array of clock names
> @@ -71,6 +72,7 @@ struct hantro_variant {
> unsigned int codec;
> const struct hantro_codec_ops *codec_ops;
> int (*init)(struct hantro_dev *vpu);
> + int (*runtime_resume)(struct hantro_dev *vpu);
> irqreturn_t (*vepu_irq)(int irq, void *priv);
> irqreturn_t (*vdpu_irq)(int irq, void *priv);
> const char *clk_names[HANTRO_MAX_CLOCKS];
> diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> index e4390aa5c213..fb5f140dbaae 100644
> --- a/drivers/staging/media/hantro/hantro_drv.c
> +++ b/drivers/staging/media/hantro/hantro_drv.c
> @@ -831,9 +831,22 @@ static int hantro_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_PM
> +static int hantro_runtime_resume(struct device *dev)
> +{
> + struct hantro_dev *vpu = dev_get_drvdata(dev);
> +
> + if (vpu->variant->runtime_resume)
> + return vpu->variant->runtime_resume(vpu);
> +
> + return 0;
> +}
> +#endif
> +
> static const struct dev_pm_ops hantro_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> pm_runtime_force_resume)
> + SET_RUNTIME_PM_OPS(NULL, hantro_runtime_resume, NULL)
> };
>
> static struct platform_driver hantro_driver = {
next prev parent reply other threads:[~2019-05-29 11:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 9:54 [PATCH v2 0/9] Rename Rockchip VPU driver to Hantro, add initial i.MX8M support Philipp Zabel
2019-05-29 9:54 ` [PATCH v2 1/9] rockchip/vpu: rename from rockchip to hantro Philipp Zabel
2019-05-29 11:16 ` Boris Brezillon
2019-05-29 9:54 ` [PATCH v2 2/9] media: hantro: print video device name in addition to device node Philipp Zabel
2019-05-29 11:16 ` Boris Brezillon
2019-05-29 9:54 ` [PATCH v2 3/9] media: hantro: add PM runtime resume callback Philipp Zabel
2019-05-29 11:18 ` Boris Brezillon [this message]
2019-05-29 9:54 ` [PATCH v2 4/9] media: hantro: make irq names configurable Philipp Zabel
2019-05-29 11:34 ` Boris Brezillon
2019-05-29 12:24 ` Philipp Zabel
2019-05-29 9:54 ` [PATCH v2 5/9] media: hantro: add support for named register ranges Philipp Zabel
2019-05-29 11:46 ` Boris Brezillon
2019-05-29 13:20 ` Philipp Zabel
2019-05-29 13:46 ` Boris Brezillon
2019-05-29 9:54 ` [PATCH v2 6/9] media: hantro: add support for separate control block Philipp Zabel
2019-05-29 9:54 ` [PATCH v2 7/9] media: dt-bindings: Document i.MX8MQ and i.MX8MM VPU bindings Philipp Zabel
2019-05-29 9:54 ` [PATCH v2 8/9] media: hantro: add initial i.MX8MQ support Philipp Zabel
2019-05-29 9:54 ` [PATCH v2 9/9] media: hantro: add initial i.MX8MM support (untested) Philipp Zabel
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=20190529131814.6d8d14cc@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=jonas@kwiboo.se \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nicolas@ndufresne.ca \
--cc=p.zabel@pengutronix.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).