From: Adrian Ratiu <adrian.ratiu@collabora.com> To: Ezequiel Garcia <ezequiel@collabora.com>, Philipp Zabel <p.zabel@pengutronix.de> Cc: Mark Brown <broonie@kernel.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, Fruehberger Peter <Peter.Fruehberger@de.bosch.com>, kuhanh.murugasen.krishnan@intel.com, Daniel Vetter <daniel@ffwll.ch>, kernel@collabora.com, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/18] media: hantro: prepare clocks before variant inits are run Date: Mon, 12 Oct 2020 23:59:44 +0300 [thread overview] Message-ID: <20201012205957.889185-6-adrian.ratiu@collabora.com> (raw) In-Reply-To: <20201012205957.889185-1-adrian.ratiu@collabora.com> The fundamental idea is: clocks are prepared in the driver probe() then each use-case will enable/disable them as needed. Some variants like imx8mq need to have the clocks enabled during the HW init phase, so they will benefit from having the clocks prepared before the variant init callback to avoid duing a full prepare_enable/ unprepare_disable, so move the clk prepare a bit earlier. Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com> --- drivers/staging/media/hantro/hantro_drv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index c2ea54552ce9..3734efa80a7e 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -813,22 +813,22 @@ static int hantro_probe(struct platform_device *pdev) } } + ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); + if (ret) { + dev_err(&pdev->dev, "Failed to prepare clocks\n"); + return ret; + } + ret = vpu->variant->init(vpu); if (ret) { dev_err(&pdev->dev, "Failed to init VPU hardware\n"); - return ret; + goto err_clk_unprepare; } pm_runtime_set_autosuspend_delay(vpu->dev, 100); pm_runtime_use_autosuspend(vpu->dev); pm_runtime_enable(vpu->dev); - ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); - if (ret) { - dev_err(&pdev->dev, "Failed to prepare clocks\n"); - return ret; - } - ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev); if (ret) { dev_err(&pdev->dev, "Failed to register v4l2 device\n"); -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Adrian Ratiu <adrian.ratiu@collabora.com> To: Ezequiel Garcia <ezequiel@collabora.com>, Philipp Zabel <p.zabel@pengutronix.de> Cc: Fruehberger Peter <Peter.Fruehberger@de.bosch.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown <broonie@kernel.org>, kuhanh.murugasen.krishnan@intel.com, Daniel Vetter <daniel@ffwll.ch>, kernel@collabora.com, linux-media@vger.kernel.org Subject: [PATCH 05/18] media: hantro: prepare clocks before variant inits are run Date: Mon, 12 Oct 2020 23:59:44 +0300 [thread overview] Message-ID: <20201012205957.889185-6-adrian.ratiu@collabora.com> (raw) In-Reply-To: <20201012205957.889185-1-adrian.ratiu@collabora.com> The fundamental idea is: clocks are prepared in the driver probe() then each use-case will enable/disable them as needed. Some variants like imx8mq need to have the clocks enabled during the HW init phase, so they will benefit from having the clocks prepared before the variant init callback to avoid duing a full prepare_enable/ unprepare_disable, so move the clk prepare a bit earlier. Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com> --- drivers/staging/media/hantro/hantro_drv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index c2ea54552ce9..3734efa80a7e 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -813,22 +813,22 @@ static int hantro_probe(struct platform_device *pdev) } } + ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); + if (ret) { + dev_err(&pdev->dev, "Failed to prepare clocks\n"); + return ret; + } + ret = vpu->variant->init(vpu); if (ret) { dev_err(&pdev->dev, "Failed to init VPU hardware\n"); - return ret; + goto err_clk_unprepare; } pm_runtime_set_autosuspend_delay(vpu->dev, 100); pm_runtime_use_autosuspend(vpu->dev); pm_runtime_enable(vpu->dev); - ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); - if (ret) { - dev_err(&pdev->dev, "Failed to prepare clocks\n"); - return ret; - } - ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev); if (ret) { dev_err(&pdev->dev, "Failed to register v4l2 device\n"); -- 2.28.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-10-12 21:00 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-12 20:59 [PATCH 00/18] Add Hantro regmap and VC8000 h264 decode support Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 01/18] media: hantro: document all int reg bits up to vc8000 Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 02/18] media: hantro: make consistent use of decimal register notation Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 03/18] media: hantro: make G1_REG_SOFT_RESET Rockchip specific Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 04/18] media: hantro: add reset controller support Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-13 8:11 ` Philipp Zabel 2020-10-13 8:11 ` Philipp Zabel 2020-10-12 20:59 ` Adrian Ratiu [this message] 2020-10-12 20:59 ` [PATCH 05/18] media: hantro: prepare clocks before variant inits are run Adrian Ratiu 2020-10-12 20:59 ` [PATCH 06/18] media: hantro: imx8mq: simplify ctrlblk reset logic Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 07/18] regmap: mmio: add config option to allow relaxed MMIO accesses Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-13 10:26 ` Mark Brown 2020-10-13 10:26 ` Mark Brown 2020-10-14 11:51 ` Adrian Ratiu 2020-10-14 11:51 ` Adrian Ratiu 2020-10-14 12:12 ` Mark Brown 2020-10-14 12:12 ` Mark Brown 2020-10-14 13:00 ` Adrian Ratiu 2020-10-14 13:00 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 08/18] media: hantro: add initial MMIO regmap infrastructure Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 09/18] media: hantro: default regmap to relaxed MMIO Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 10/18] media: hantro: convert G1 h264 decoder to regmap fields Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 11/18] media: hantro: convert G1 postproc to regmap Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 12/18] media: hantro: add VC8000D h264 decoding Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 13/18] media: hantro: add VC8000D postproc support Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 14/18] media: hantro: make PP enablement logic a bit smarter Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 15/18] media: hantro: add user-selectable, platform-selectable H264 High10 Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 16/18] media: hantro: rename h264_dec as it's not G1 specific anymore Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 17/18] media: hantro: add dump registers debug option before decode start Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 20:59 ` [PATCH 18/18] media: hantro: document encoder reg fields Adrian Ratiu 2020-10-12 20:59 ` Adrian Ratiu 2020-10-12 23:39 ` [PATCH 00/18] Add Hantro regmap and VC8000 h264 decode support Jonas Karlman 2020-10-12 23:39 ` Jonas Karlman 2020-10-13 6:48 ` Adrian Ratiu 2020-10-13 6:48 ` Adrian Ratiu 2020-10-29 12:38 ` Ezequiel Garcia 2020-10-29 12:38 ` Ezequiel Garcia 2020-10-29 16:21 ` Jonas Karlman 2020-10-29 16:21 ` Jonas Karlman 2020-11-03 15:27 ` Ezequiel Garcia 2020-11-03 15:27 ` Ezequiel Garcia 2020-10-29 13:07 ` Ezequiel Garcia 2020-10-29 13:07 ` Ezequiel Garcia 2020-10-29 14:15 ` Robin Murphy 2020-10-29 14:15 ` Robin Murphy 2020-10-29 14:48 ` Mark Brown 2020-10-29 14:48 ` Mark Brown 2020-10-29 16:27 ` Ezequiel Garcia 2020-10-29 16:27 ` Ezequiel Garcia 2020-10-29 17:59 ` Mark Brown 2020-10-29 17:59 ` Mark Brown
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=20201012205957.889185-6-adrian.ratiu@collabora.com \ --to=adrian.ratiu@collabora.com \ --cc=Peter.Fruehberger@de.bosch.com \ --cc=broonie@kernel.org \ --cc=daniel@ffwll.ch \ --cc=ezequiel@collabora.com \ --cc=kernel@collabora.com \ --cc=kuhanh.murugasen.krishnan@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mchehab@kernel.org \ --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: 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.