From: Philipp Zabel <p.zabel@pengutronix.de>
To: Michal Wilczynski <m.wilczynski@samsung.com>,
mturquette@baylibre.com, sboyd@kernel.org, robh@kernel.org,
krzk+dt@kernel.org, conor+dt@kernel.org, drew@pdp7.com,
guoren@kernel.org, wefu@redhat.com, jassisinghbrar@gmail.com,
paul.walmsley@sifive.com, palmer@dabbelt.com,
aou@eecs.berkeley.edu, frank.binns@imgtec.com,
matt.coster@imgtec.com, maarten.lankhorst@linux.intel.com,
mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com,
simona@ffwll.ch, ulf.hansson@linaro.org, jszhang@kernel.org,
m.szyprowski@samsung.com
Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org,
dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org
Subject: Re: [RFC v3 09/18] drm/imagination: Add reset controller support for GPU initialization
Date: Tue, 21 Jan 2025 09:24:48 +0100 [thread overview]
Message-ID: <518c440a74b592099b1f5dddd95dbc23615dd034.camel@pengutronix.de> (raw)
In-Reply-To: <20250120172111.3492708-10-m.wilczynski@samsung.com>
On Mo, 2025-01-20 at 18:21 +0100, Michal Wilczynski wrote:
> Certain platforms, such as the T-Head TH1520 and Banana Pi BPI-F3,
> require a controlled GPU reset sequence during the power-up procedure
> to ensure proper initialization. Without this reset, the GPU may remain
> in an undefined state, potentially leading to stability or performance
> issues.
>
> This commit integrates a dedicated reset controller within the
> drm/imagination driver. By doing so, the driver can coordinate the
> necessary reset operations as part of the normal GPU bring-up process,
> improving reliability and ensuring that the hardware is ready for
> operation.
>
> Signed-off-by: Michal Wilczynski <m.wilczynski@samsung.com>
> ---
> drivers/gpu/drm/imagination/pvr_device.c | 21 +++++++++++++++++++++
> drivers/gpu/drm/imagination/pvr_device.h | 9 +++++++++
> drivers/gpu/drm/imagination/pvr_power.c | 15 ++++++++++++++-
> 3 files changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c
> index 1704c0268589..7ae9875d8d74 100644
> --- a/drivers/gpu/drm/imagination/pvr_device.c
> +++ b/drivers/gpu/drm/imagination/pvr_device.c
> @@ -25,6 +25,7 @@
> #include <linux/interrupt.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> +#include <linux/reset.h>
> #include <linux/slab.h>
> #include <linux/stddef.h>
> #include <linux/types.h>
> @@ -120,6 +121,21 @@ static int pvr_device_clk_init(struct pvr_device *pvr_dev)
> return 0;
> }
>
> +static int pvr_device_reset_init(struct pvr_device *pvr_dev)
> +{
> + struct drm_device *drm_dev = from_pvr_device(pvr_dev);
> + struct reset_control *reset;
> +
> + reset = devm_reset_control_get_exclusive_by_index(drm_dev->dev, 0);
The dt-bindings only specify a single reset. No need to request by
index. Please use:
reset = devm_reset_control_get_exclusive(drm_dev->dev, NULL);
instead. Or devm_reset_control_get_optional_exclusive(), perhaps? See
below.
> + if (IS_ERR(reset))
> + return dev_err_probe(drm_dev->dev, PTR_ERR(reset),
> + "failed to get gpu reset line\n");
> +
> + pvr_dev->reset = reset;
> +
> + return 0;
> +}
> +
> /**
> * pvr_device_process_active_queues() - Process all queue related events.
> * @pvr_dev: PowerVR device to check
> @@ -509,6 +525,11 @@ pvr_device_init(struct pvr_device *pvr_dev)
> if (err)
> return err;
>
> + /* Get the reset line for the GPU */
> + err = pvr_device_reset_init(pvr_dev);
> + if (err)
> + return err;
> +
> /* Explicitly power the GPU so we can access control registers before the FW is booted. */
> err = pm_runtime_resume_and_get(dev);
> if (err)
> diff --git a/drivers/gpu/drm/imagination/pvr_device.h b/drivers/gpu/drm/imagination/pvr_device.h
> index 6d0dfacb677b..f6576c08111c 100644
> --- a/drivers/gpu/drm/imagination/pvr_device.h
> +++ b/drivers/gpu/drm/imagination/pvr_device.h
> @@ -131,6 +131,15 @@ struct pvr_device {
> */
> struct clk *mem_clk;
>
> + /**
> + * @reset: Optional reset line.
This looks like the reset control really should be made optional in
pvr_device_reset_init().
> + *
> + * This may be used on some platforms to provide a reset line that needs to be de-asserted
> + * after power-up procedure. It would also need to be asserted after the power-down
> + * procedure.
> + */
> + struct reset_control *reset;
> +
> /** @irq: IRQ number. */
> int irq;
>
> diff --git a/drivers/gpu/drm/imagination/pvr_power.c b/drivers/gpu/drm/imagination/pvr_power.c
> index ba7816fd28ec..87a955600d8b 100644
> --- a/drivers/gpu/drm/imagination/pvr_power.c
> +++ b/drivers/gpu/drm/imagination/pvr_power.c
> @@ -15,6 +15,7 @@
> #include <linux/mutex.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> +#include <linux/reset.h>
> #include <linux/timer.h>
> #include <linux/types.h>
> #include <linux/workqueue.h>
> @@ -252,6 +253,9 @@ pvr_power_device_suspend(struct device *dev)
> clk_disable_unprepare(pvr_dev->sys_clk);
> clk_disable_unprepare(pvr_dev->core_clk);
>
> + if (pvr_dev->reset)
> + err = reset_control_assert(pvr_dev->reset);
No need for conditional assert, reset_control_assert(NULL) is a no-op.
Just use:
err = reset_control_assert(pvr_dev->reset);
> +
> err_drm_dev_exit:
> drm_dev_exit(idx);
>
> @@ -282,16 +286,25 @@ pvr_power_device_resume(struct device *dev)
> if (err)
> goto err_sys_clk_disable;
>
> + if (pvr_dev->reset) {
> + err = reset_control_deassert(pvr_dev->reset);
> + if (err)
> + goto err_mem_clk_disable;
> + }
Same as above, reset_control_deassert(NULL) returns 0:
err = reset_control_deassert(pvr_dev->reset);
if (err)
goto err_mem_clk_disable;
regards
Philipp
next prev parent reply other threads:[~2025-01-21 8:25 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20250120172119eucas1p135434171194546bc2df259bfd21458e1@eucas1p1.samsung.com>
2025-01-20 17:20 ` [RFC v3 00/18] Enable drm/imagination BXM-4-64 Support for LicheePi 4A Michal Wilczynski
[not found] ` <CGME20250120172120eucas1p23993cdbbe65e82054b9cb92fb704103b@eucas1p2.samsung.com>
2025-01-20 17:20 ` [RFC v3 01/18] dt-bindings: clock: Add VO subsystem clock controller support Michal Wilczynski
2025-01-21 9:47 ` Krzysztof Kozlowski
2025-01-21 21:29 ` Michal Wilczynski
2025-01-22 7:44 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172121eucas1p24ed47f684da5f1dcf0df7735e21f2b4c@eucas1p2.samsung.com>
2025-01-20 17:20 ` [RFC v3 02/18] clk: thead: Add clock support for VO subsystem in T-Head TH1520 SoC Michal Wilczynski
[not found] ` <CGME20250120172123eucas1p13564bf2d07000506caf44cf55bda7fd9@eucas1p1.samsung.com>
2025-01-20 17:20 ` [RFC v3 03/18] dt-bindings: firmware: thead,th1520: Add support for firmware node Michal Wilczynski
2025-01-21 9:52 ` Krzysztof Kozlowski
2025-01-21 21:31 ` Michal Wilczynski
2025-01-22 7:44 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172124eucas1p233b3f6da39e7064db62b02a66bc1ac29@eucas1p2.samsung.com>
2025-01-20 17:20 ` [RFC v3 04/18] firmware: thead: Add AON firmware protocol driver Michal Wilczynski
2025-01-21 9:56 ` Krzysztof Kozlowski
2025-01-21 21:32 ` Michal Wilczynski
2025-01-28 15:54 ` Michal Wilczynski
2025-01-28 16:27 ` Michal Wilczynski
2025-01-29 7:24 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172125eucas1p141540607f423eea4c55b2bd22ff5adf0@eucas1p1.samsung.com>
2025-01-20 17:20 ` [RFC v3 05/18] pmdomain: thead: Add power-domain driver for TH1520 Michal Wilczynski
2025-01-21 9:55 ` Ulf Hansson
2025-01-28 15:59 ` Michal Wilczynski
2025-01-21 10:02 ` Krzysztof Kozlowski
2025-01-21 21:42 ` Michal Wilczynski
2025-01-22 7:46 ` Krzysztof Kozlowski
2025-01-22 11:26 ` Michal Wilczynski
2025-01-22 11:36 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172127eucas1p18a33aa80018ff77317c7f02cf94f8e79@eucas1p1.samsung.com>
2025-01-20 17:20 ` [RFC v3 06/18] riscv: Enable PM_GENERIC_DOMAINS for T-Head SoCs Michal Wilczynski
[not found] ` <CGME20250120172128eucas1p2847f0863524b53d2d5029e5e9d238298@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 07/18] dt-bindings: reset: Add T-HEAD TH1520 SoC Reset Controller Michal Wilczynski
2025-01-21 8:35 ` Philipp Zabel
2025-01-21 21:58 ` Michal Wilczynski
2025-01-22 8:22 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172129eucas1p236f71df4e30f821f7682263ee8ecec06@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 08/18] reset: thead: Add TH1520 reset controller driver Michal Wilczynski
2025-01-21 8:40 ` Philipp Zabel
[not found] ` <CGME20250120172131eucas1p1ed7fc14a96c66b1dc9e14e9fc7cbb2b7@eucas1p1.samsung.com>
2025-01-20 17:21 ` [RFC v3 09/18] drm/imagination: Add reset controller support for GPU initialization Michal Wilczynski
2025-01-21 8:24 ` Philipp Zabel [this message]
[not found] ` <CGME20250120172133eucas1p232c85cb934148427e52dd939c974a82b@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 10/18] dt-bindings: gpu: Add 'resets' property " Michal Wilczynski
2025-01-21 10:09 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172134eucas1p18cbf29a4ade281df10efce210cc8893e@eucas1p1.samsung.com>
2025-01-20 17:21 ` [RFC v3 11/18] dt-bindings: gpu: Add compatibles for T-HEAD TH1520 GPU Michal Wilczynski
2025-01-21 10:08 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172135eucas1p22f50d9db3fb656fbaf6ccc096dcb8c9f@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 12/18] drm/imagination: Add support for IMG BXM-4-64 GPU Michal Wilczynski
[not found] ` <CGME20250120172136eucas1p2a8348fbcfdf42efa8c130d558381f599@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 13/18] drm/imagination: Enable PowerVR driver for RISC-V Michal Wilczynski
[not found] ` <CGME20250120172138eucas1p294698126686b5d3a9281c0a5428f2cf6@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 14/18] riscv: dts: thead: Add device tree VO clock controller Michal Wilczynski
[not found] ` <CGME20250120172139eucas1p276872579d306da801c455630c0b5c8e5@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 15/18] riscv: dts: thead: Add mailbox node Michal Wilczynski
[not found] ` <CGME20250120172140eucas1p26bd83fb8195d0ed01b7b214ed374948f@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 16/18] riscv: dts: thead: Introduce power domain nodes with aon firmware Michal Wilczynski
2025-01-21 10:11 ` Krzysztof Kozlowski
[not found] ` <CGME20250120172142eucas1p1028244022b09039f4cc9ce1235c5d80c@eucas1p1.samsung.com>
2025-01-20 17:21 ` [RFC v3 17/18] riscv: dts: thead: Introduce reset controller node Michal Wilczynski
[not found] ` <CGME20250120172143eucas1p2cb4c77eee4833b4de668a2aadb5a2087@eucas1p2.samsung.com>
2025-01-20 17:21 ` [RFC v3 18/18] riscv: dts: thead: Add GPU node to TH1520 device tree Michal Wilczynski
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=518c440a74b592099b1f5dddd95dbc23615dd034.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=airlied@gmail.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=drew@pdp7.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=frank.binns@imgtec.com \
--cc=guoren@kernel.org \
--cc=jassisinghbrar@gmail.com \
--cc=jszhang@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=m.szyprowski@samsung.com \
--cc=m.wilczynski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matt.coster@imgtec.com \
--cc=mripard@kernel.org \
--cc=mturquette@baylibre.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
--cc=ulf.hansson@linaro.org \
--cc=wefu@redhat.com \
/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).