* [PATCH v6 0/2] Add optional reset for the drm/imagination driver [not found] <CGME20250418112258eucas1p28186b27890dbed4cbc05b2ddd8f94327@eucas1p2.samsung.com> @ 2025-04-18 11:22 ` Michal Wilczynski [not found] ` <CGME20250418112258eucas1p22817a5693654e02016bcdc79068ed9e0@eucas1p2.samsung.com> ` (3 more replies) 0 siblings, 4 replies; 5+ messages in thread From: Michal Wilczynski @ 2025-04-18 11:22 UTC (permalink / raw) To: Frank Binns, Matt Coster, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Philipp Zabel, Marek Szyprowski Cc: dri-devel, devicetree, linux-kernel, Krzysztof Kozlowski, Michal Wilczynski This patch series introduces and documents optional reset support for the drm/imagination driver. While developed as part of a larger effort to enable the Imagination BXM-4-64 GPU upstream, these patches can merge independently. During the upstreaming process, we discovered that the T-HEAD TH1520 SoC requires custom code to manage resets and clocks from the power-domain driver [1]. Nevertheless, adding this reset capability is necessary, as the GPU Device Tree node would own the reset control and would manage it for boards like BPI-F3 that don't have custom requirements for handling clocks and resets during their startup sequence. For more context, please see the cover letter for the larger series [2]. [1] - https://lore.kernel.org/all/20250414-apr_14_for_sending-v2-0-70c5af2af96c@samsung.com/ [2] - https://lore.kernel.org/all/20250219140239.1378758-1-m.wilczynski@samsung.com/ This series is versioned to maintain continuity with the bigger patchset it is a subseries of. Please find below changelog for the drm/imagination reset part: v6: - no changes, just a re-send, bumping version to avoid confusion v5: - moved the recommended 1 microsecond delay after de-asserting GPU reset to the Imagination driver itself v4: - reverted reset-cells configuration to single cell as in v2 - addressed minor implementation issues in the DRM/Imagination reset driver v3: - refactored reset driver to use zero cells v2: - updated the drm/imagination driver to act as a reset controller consumer. While this patchset is focused on the LPI4A board, the reset controller is designed to be useful for other boards, such as the BPI-3F, which also require a reset sequence after power-up. --- Michal Wilczynski (2): dt-bindings: gpu: Add 'resets' property for GPU initialization drm/imagination: Add reset controller support for GPU initialization .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 3 +++ drivers/gpu/drm/imagination/pvr_device.c | 21 +++++++++++++++++++++ drivers/gpu/drm/imagination/pvr_device.h | 9 +++++++++ drivers/gpu/drm/imagination/pvr_power.c | 22 +++++++++++++++++++++- 4 files changed, 54 insertions(+), 1 deletion(-) --- base-commit: fc96b232f8e7c0a6c282f47726b2ff6a5fb341d2 change-id: 20250418-apr_18_reset_img-b102988052de Best regards, -- Michal Wilczynski <m.wilczynski@samsung.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CGME20250418112258eucas1p22817a5693654e02016bcdc79068ed9e0@eucas1p2.samsung.com>]
* [PATCH v6 1/2] dt-bindings: gpu: Add 'resets' property for GPU initialization [not found] ` <CGME20250418112258eucas1p22817a5693654e02016bcdc79068ed9e0@eucas1p2.samsung.com> @ 2025-04-18 11:22 ` Michal Wilczynski 0 siblings, 0 replies; 5+ messages in thread From: Michal Wilczynski @ 2025-04-18 11:22 UTC (permalink / raw) To: Frank Binns, Matt Coster, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Philipp Zabel, Marek Szyprowski Cc: dri-devel, devicetree, linux-kernel, Krzysztof Kozlowski, Michal Wilczynski All IMG Rogue GPUs include a reset line that participates in the power-up sequence. On some SoCs (e.g., T-Head TH1520 and Banana Pi BPI-F3), this reset line is exposed and must be driven explicitly to ensure proper initialization. To support this, add a 'resets' property to the GPU device tree bindings. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Michal Wilczynski <m.wilczynski@samsung.com> --- Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml b/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml index 256e252f8087fa0d6081f771a01601d34b66fe19..bb607d4b1e072dacd184bf2782cacddf550580e4 100644 --- a/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml +++ b/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml @@ -37,6 +37,9 @@ properties: power-domains: maxItems: 1 + resets: + maxItems: 1 + required: - compatible - reg -- 2.34.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CGME20250418112259eucas1p14c8a04007b0e279b8e134db9e1502d7c@eucas1p1.samsung.com>]
* [PATCH v6 2/2] drm/imagination: Add reset controller support for GPU initialization [not found] ` <CGME20250418112259eucas1p14c8a04007b0e279b8e134db9e1502d7c@eucas1p1.samsung.com> @ 2025-04-18 11:22 ` Michal Wilczynski 0 siblings, 0 replies; 5+ messages in thread From: Michal Wilczynski @ 2025-04-18 11:22 UTC (permalink / raw) To: Frank Binns, Matt Coster, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Philipp Zabel, Marek Szyprowski Cc: dri-devel, devicetree, linux-kernel, Michal Wilczynski All IMG Rogue GPUs include a reset line that participates in the power-up sequence. On some SoCs (e.g., T-Head TH1520 and Banana Pi BPI-F3), this reset line is exposed and must be driven explicitly to ensure proper initialization. On others, such as the currently supported TI SoC, the reset logic is handled in hardware or firmware without exposing the line directly. In platforms where the reset line is externally accessible, if it is not driven correctly, the GPU may remain in an undefined state, leading to instability or performance issues. This commit adds a dedicated reset controller to the drm/imagination driver. By managing the reset line (where applicable) as part of normal GPU bring-up, the driver ensures reliable initialization across platforms regardless of whether the reset is controlled externally or handled internally. 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 | 22 +++++++++++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c index 1704c0268589bdeb65fa6535f9ec63182b0a3e94..ef73e95157eeb127f3d7543d77f82242d01a2d43 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_optional_exclusive(drm_dev->dev, NULL); + 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 6d0dfacb677b46a880f37f419dfa7b67c68fe63d..f6576c08111c86f2a771dfe99b5518795b6aead7 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 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 ba7816fd28ec77e6ca5ce408302a413ce1afeb6e..5944645bf1b2f5ba6c954a841d85d043db171c4b 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,8 @@ pvr_power_device_suspend(struct device *dev) clk_disable_unprepare(pvr_dev->sys_clk); clk_disable_unprepare(pvr_dev->core_clk); + err = reset_control_assert(pvr_dev->reset); + err_drm_dev_exit: drm_dev_exit(idx); @@ -282,16 +285,33 @@ pvr_power_device_resume(struct device *dev) if (err) goto err_sys_clk_disable; + /* + * According to the hardware manual, a delay of at least 32 clock + * cycles is required between de-asserting the clkgen reset and + * de-asserting the GPU reset. Assuming a worst-case scenario with + * a very high GPU clock frequency, a delay of 1 microsecond is + * sufficient to ensure this requirement is met across all + * feasible GPU clock speeds. + */ + udelay(1); + + err = reset_control_deassert(pvr_dev->reset); + if (err) + goto err_mem_clk_disable; + if (pvr_dev->fw_dev.booted) { err = pvr_power_fw_enable(pvr_dev); if (err) - goto err_mem_clk_disable; + goto err_reset_assert; } drm_dev_exit(idx); return 0; +err_reset_assert: + reset_control_assert(pvr_dev->reset); + err_mem_clk_disable: clk_disable_unprepare(pvr_dev->mem_clk); -- 2.34.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6 0/2] Add optional reset for the drm/imagination driver 2025-04-18 11:22 ` [PATCH v6 0/2] Add optional reset for the drm/imagination driver Michal Wilczynski [not found] ` <CGME20250418112258eucas1p22817a5693654e02016bcdc79068ed9e0@eucas1p2.samsung.com> [not found] ` <CGME20250418112259eucas1p14c8a04007b0e279b8e134db9e1502d7c@eucas1p1.samsung.com> @ 2025-04-22 16:16 ` Matt Coster 2025-04-24 10:12 ` Matt Coster 3 siblings, 0 replies; 5+ messages in thread From: Matt Coster @ 2025-04-22 16:16 UTC (permalink / raw) To: Michal Wilczynski Cc: Frank Binns, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Philipp Zabel, Marek Szyprowski, dri-devel, devicetree, linux-kernel [-- Attachment #1.1: Type: text/plain, Size: 2900 bytes --] On 18/04/2025 12:22, Michal Wilczynski wrote: > This patch series introduces and documents optional reset support for > the drm/imagination driver. While developed as part of a larger effort > to enable the Imagination BXM-4-64 GPU upstream, these patches can merge > independently. > > During the upstreaming process, we discovered that the T-HEAD TH1520 SoC > requires custom code to manage resets and clocks from the power-domain > driver [1]. Nevertheless, adding this reset capability is necessary, as > the GPU Device Tree node would own the reset control and would manage it > for boards like BPI-F3 that don't have custom requirements for handling > clocks and resets during their startup sequence. > > For more context, please see the cover letter for the larger series [2]. Hi Michal, Thank you for persisting with these changes, I know we haven't always made it easy for you! This series (sub-series?) is: Reviewed-by: Matt Coster <matt.coster@imgtec.com> If nobody has any objections, I'll apply it to drm-misc-next tomorrow. Cheers, Matt > > [1] - https://lore.kernel.org/all/20250414-apr_14_for_sending-v2-0-70c5af2af96c@samsung.com/ > [2] - https://lore.kernel.org/all/20250219140239.1378758-1-m.wilczynski@samsung.com/ > > This series is versioned to maintain continuity with the bigger patchset > it is a subseries of. Please find below changelog for the > drm/imagination reset part: > > v6: > - no changes, just a re-send, bumping version to avoid confusion > > v5: > - moved the recommended 1 microsecond delay after de-asserting GPU > reset to the Imagination driver itself > > v4: > - reverted reset-cells configuration to single cell as in v2 > - addressed minor implementation issues in the DRM/Imagination reset driver > > v3: > - refactored reset driver to use zero cells > > v2: > - updated the drm/imagination driver to act as a reset controller > consumer. While this patchset is focused on the LPI4A board, the > reset controller is designed to be useful for other boards, such as the > BPI-3F, which also require a reset sequence after power-up. > > --- > Michal Wilczynski (2): > dt-bindings: gpu: Add 'resets' property for GPU initialization > drm/imagination: Add reset controller support for GPU initialization > > .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 3 +++ > drivers/gpu/drm/imagination/pvr_device.c | 21 +++++++++++++++++++++ > drivers/gpu/drm/imagination/pvr_device.h | 9 +++++++++ > drivers/gpu/drm/imagination/pvr_power.c | 22 +++++++++++++++++++++- > 4 files changed, 54 insertions(+), 1 deletion(-) > --- > base-commit: fc96b232f8e7c0a6c282f47726b2ff6a5fb341d2 > change-id: 20250418-apr_18_reset_img-b102988052de > > Best regards, -- Matt Coster E: matt.coster@imgtec.com [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6 0/2] Add optional reset for the drm/imagination driver 2025-04-18 11:22 ` [PATCH v6 0/2] Add optional reset for the drm/imagination driver Michal Wilczynski ` (2 preceding siblings ...) 2025-04-22 16:16 ` [PATCH v6 0/2] Add optional reset for the drm/imagination driver Matt Coster @ 2025-04-24 10:12 ` Matt Coster 3 siblings, 0 replies; 5+ messages in thread From: Matt Coster @ 2025-04-24 10:12 UTC (permalink / raw) To: Frank Binns, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Philipp Zabel, Marek Szyprowski, Michal Wilczynski Cc: dri-devel, devicetree, linux-kernel, Krzysztof Kozlowski On Fri, 18 Apr 2025 13:22:47 +0200, Michal Wilczynski wrote: > This patch series introduces and documents optional reset support for > the drm/imagination driver. While developed as part of a larger effort > to enable the Imagination BXM-4-64 GPU upstream, these patches can merge > independently. > > During the upstreaming process, we discovered that the T-HEAD TH1520 SoC > requires custom code to manage resets and clocks from the power-domain > driver [1]. Nevertheless, adding this reset capability is necessary, as > the GPU Device Tree node would own the reset control and would manage it > for boards like BPI-F3 that don't have custom requirements for handling > clocks and resets during their startup sequence. > > [...] Applied, thanks! [1/2] dt-bindings: gpu: Add 'resets' property for GPU initialization commit: 1300a7f8a7d4c5f88de30312cf34448b96539c23 [2/2] drm/imagination: Add reset controller support for GPU initialization commit: 3a2b7389feea9a7afd18d58cda59b7a989445f38 Best regards, -- Matt Coster <matt.coster@imgtec.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-04-24 10:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20250418112258eucas1p28186b27890dbed4cbc05b2ddd8f94327@eucas1p2.samsung.com>
2025-04-18 11:22 ` [PATCH v6 0/2] Add optional reset for the drm/imagination driver Michal Wilczynski
[not found] ` <CGME20250418112258eucas1p22817a5693654e02016bcdc79068ed9e0@eucas1p2.samsung.com>
2025-04-18 11:22 ` [PATCH v6 1/2] dt-bindings: gpu: Add 'resets' property for GPU initialization Michal Wilczynski
[not found] ` <CGME20250418112259eucas1p14c8a04007b0e279b8e134db9e1502d7c@eucas1p1.samsung.com>
2025-04-18 11:22 ` [PATCH v6 2/2] drm/imagination: Add reset controller support " Michal Wilczynski
2025-04-22 16:16 ` [PATCH v6 0/2] Add optional reset for the drm/imagination driver Matt Coster
2025-04-24 10:12 ` Matt Coster
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®