drm/etnaviv: add optional reset support
Subsystems (2)
PATCH v2 1/1 drm/etnaviv: add optional reset support
Add optional reset support which is mentioned in vivante,gc.yaml to allow the driver to work on SoCs whose reset signal is asserted by default Avoid enabling the interrupt until everything is ready
---
v2:
- Add missing include of irq.h
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 +++++++++++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 ++ 2 files changed, 32 insertions(+)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +30 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales */ #include <linux/clk.h>
@@ -8,11 +9,13 @@#include <linux/delay.h> #include <linux/dma-fence.h> #include <linux/dma-mapping.h> +#include <linux/irq.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/thermal.h> #include "etnaviv_cmdbuf.h"
@@ -1629,8 +1632,24 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)if (ret) goto disable_clk_core; +/* 32 core clock cycles (slowest clock) required before deassertion. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + + ret =reset_control_deassert (gpu->rst); +if (ret) + goto disable_clk_shader; + +/* 128 core clock cycles (slowest clock) required before any activity on AHB. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + +enable_irq (gpu->irq); +return 0 ; +disable_clk_shader: +clk_disable_unprepare (gpu->clk_shader); disable_clk_core:clk_disable_unprepare (gpu->clk_core); disable_clk_bus:
@@ -1643,6 +1662,8 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)static int etnaviv_gpu_clk_disable (struct etnaviv_gpu *gpu) { +disable_irq (gpu->irq); +reset_control_assert (gpu->rst);clk_disable_unprepare (gpu->clk_shader);clk_disable_unprepare (gpu->clk_core);clk_disable_unprepare (gpu->clk_bus);
@@ -1876,6 +1897,9 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)if (gpu->irq <0 )return gpu->irq; +/* Avoid enabling the interrupt until everything is ready */ +irq_set_status_flags (gpu->irq,IRQ_NOAUTOEN ); + err =devm_request_irq (&pdev->dev, gpu->irq, irq_handler,0 ,dev_name (gpu->dev), gpu);if (err) {
@@ -1883,6 +1907,12 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)return err; } +/* Get Reset: */ + gpu->rst =devm_reset_control_get_optional (&pdev->dev,NULL ); +if (IS_ERR (gpu->rst)) +return dev_err_probe (dev,PTR_ERR (gpu->rst), +"failed to get reset\n" ); +/* Get Clocks: */ gpu->clk_reg =devm_clk_get_optional (&pdev->dev,"reg" );DBG ("clk_reg: %p" , gpu->clk_reg);
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +2 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales */ #ifndef __ETNAVIV_GPU_H__
@@ -157,6 +158,7 @@ struct etnaviv_gpu {struct clk *clk_reg;struct clk *clk_core;struct clk *clk_shader; +struct reset_control *rst;unsigned int freq_scale;unsigned int fe_waitcycles;
Signature · 1 line
2.19.1
Lucas Stach
maintainerHi Philippe,
Am Freitag, dem 08.11.2024 um 14:00 +0000 schrieb LECOINTRE Philippe:
Quoted 45 lines
Add optional reset support which is mentioned in vivante,gc.yaml to allow the driver to work on SoCs whose reset signal is asserted by default Avoid enabling the interrupt until everything is ready
Signed-off-by Philippe Lecointre <[email protected]>Reviewed-by Simon Lenain <[email protected]>---
v2:
- Add missing include ofirq.h--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 +++++++++++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 ++ 2 files changed, 32 insertions(+)drivers/gpu/drm/etnaviv/etnaviv_gpu.c +4
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales */ #include <linux/clk.h> @@ -8,11 +9,13 @@#include <linux/delay.h> #include <linux/dma-fence.h> #include <linux/dma-mapping.h> +#include <linux/irq.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/thermal.h> #include "etnaviv_cmdbuf.h" @@ -1629,8 +1632,24 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)if (ret) goto disable_clk_core; +/* 32 core clock cycles (slowest clock) required before deassertion. */
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) · line 1645
Quoted 10 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +10
-0+/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + + ret =reset_control_deassert (gpu->rst); +if (ret) + goto disable_clk_shader; + +/* 128 core clock cycles (slowest clock) required before any activity on AHB. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 );
Mashing the reset handling into the clock handling is a bad idea. The clocks are en-/disabled during runtime PM handling. The etnaviv driver is written in a way that the GPU does not necessarily need to be reset during a runtime PM transition, which allow for faster startup times.
The reset handling should really be its own separate function and would logically go into etnaviv_gpu_init() between the pm_runtime_get_sync() and etnaviv_hw_identify().
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu) · line 1647
Quoted 2 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0+ +enable_irq (gpu->irq);
Do you see any issues with the IRQ being enabled earlier? A GPU being held in reset should not be able to trigger a IRQ.
Quoted 45 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +14
-0+return 0 ; +disable_clk_shader: +clk_disable_unprepare (gpu->clk_shader); disable_clk_core:clk_disable_unprepare (gpu->clk_core); disable_clk_bus:@@ -1643,6 +1662,8 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)static int etnaviv_gpu_clk_disable (struct etnaviv_gpu *gpu) { +disable_irq (gpu->irq); +reset_control_assert (gpu->rst);clk_disable_unprepare (gpu->clk_shader);clk_disable_unprepare (gpu->clk_core);clk_disable_unprepare (gpu->clk_bus);@@ -1876,6 +1897,9 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)if (gpu->irq <0 )return gpu->irq; +/* Avoid enabling the interrupt until everything is ready */ +irq_set_status_flags (gpu->irq,IRQ_NOAUTOEN ); + err =devm_request_irq (&pdev->dev, gpu->irq, irq_handler,0 ,dev_name (gpu->dev), gpu);if (err) {@@ -1883,6 +1907,12 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)return err; } +/* Get Reset: */ + gpu->rst =devm_reset_control_get_optional (&pdev->dev,NULL ); +if (IS_ERR (gpu->rst)) +return dev_err_probe (dev,PTR_ERR (gpu->rst), +"failed to get reset\n" ); +/* Get Clocks: */ gpu->clk_reg =devm_clk_get_optional (&pdev->dev,"reg" );DBG ("clk_reg: %p" , gpu->clk_reg);drivers/gpu/drm/etnaviv/etnaviv_gpu.h +0
-0
drivers/gpu/drm/etnaviv/etnaviv_gpu.h line 4
Quoted 4 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales
I don't think adding a single member here does warrant a Copyright statement, in fact I would prefer them to not be touched at all. Authorship of individual changes to the driver a clearly attributable via the git history.
Regards,
Lucas
Quoted 11 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1
-0*/ #ifndef __ETNAVIV_GPU_H__@@ -157,6 +158,7 @@ struct etnaviv_gpu {struct clk *clk_reg;struct clk *clk_core;struct clk *clk_shader; +struct reset_control *rst;unsigned int freq_scale;unsigned int fe_waitcycles;
Hi Lucas,
I am grateful to you for your answer as this is my first attempt to contribute to the kernel.
Quoted 81 lines
-----Message d'origine-----
De : Lucas Stach <[email protected]>
Envoyé : mardi 3 décembre 2024 18:58
À : LECOINTRE Philippe <[email protected]>; Russell King <[email protected]>; Christian Gmeiner <[email protected]>
Cc : David Airlie <[email protected]>; Simona Vetter <[email protected]>; [email protected]; [email protected]; linux- [email protected]; LENAIN Simon <[email protected]>; BARBEAU Etienne <[email protected]>; LEJEUNE Sebastien <[email protected]>
Objet : Re: [PATCH v2] drm/etnaviv: add optional reset supportHi Philippe,
Am Freitag, dem 08.11.2024 um 14:00 +0000 schrieb LECOINTRE Philippe:
Quoted 11 lines
Add optional reset support which is mentioned in vivante,gc.yaml to allow the driver to work on SoCs whose reset signal is asserted by default Avoid enabling the interrupt until everything is ready
Signed-off-by Philippe Lecointre <[email protected]>Reviewed-by Simon Lenain <[email protected]>---
v2:
- Add missing include ofirq.h--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30+++++++++++++++++++++++++++
Review
Quoted 4 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 ++ 2 files changed, 32 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.cdrivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct
Quoted 26 lines
index
7c7f97793ddd..3e0c5dd9f74b100644drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales */ #include <linux/clk.h> @@ -8,11 +9,13 @@#include <linux/delay.h> #include <linux/dma-fence.h> #include <linux/dma-mapping.h> +#include <linux/irq.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/thermal.h> #include "etnaviv_cmdbuf.h" @@ -1629,8 +1632,24 @@ static int etnaviv_gpu_clk_enable(struct
etnaviv_gpu*gpu)drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)
Quoted 12 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +9
-0if (ret) goto disable_clk_core; +/* 32 core clock cycles (slowest clock) required before deassertion. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + + ret =reset_control_deassert (gpu->rst); +if (ret) + goto disable_clk_shader; + +/* 128 core clock cycles (slowest clock) required before any activity on AHB. */
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct · line 1645
Quoted 2 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0+/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 );Mashing the reset handling into the clock handling is a bad idea. The clocks are en-/disabled during runtime PM handling. The etnaviv driver is written in a way that the GPU does not necessarily need to be reset during a runtime PM transition, which allow for faster startup times.
Quoted 4 lines
The reset handling should really be its own separate function and would logically go into
etnaviv_gpu_init()between thepm_runtime_get_sync()andetnaviv_hw_identify().
I will rework this part to match your feedback.
Quoted 6 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct · line 1647
Quoted 2 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0+ +enable_irq (gpu->irq);Do you see any issues with the IRQ being enabled earlier? A GPU being held in reset should not be able to trigger a IRQ.
I intend to avoid situations where IRQ are triggered for some reason and the GPU is not fully operational. Such issues might appear considering the state of reset and clocks from internal boot to kernel.
I assume this situation never appeared with SoCs that are using this driver at the moment.
But it appear on a SoC developed by an industrial partner, this lead to IRQ spamming with AXI bus error in the console.
Quoted 45 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct
Quoted 9 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3
-0+return 0 ; +disable_clk_shader: +clk_disable_unprepare (gpu->clk_shader); disable_clk_core:clk_disable_unprepare (gpu->clk_core); disable_clk_bus:@@ -1643,6 +1662,8 @@ static int etnaviv_gpu_clk_enable(struct
etnaviv_gpu*gpu)drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_platform_probe(struct
Quoted 9 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0static int etnaviv_gpu_clk_disable (struct etnaviv_gpu *gpu) { +disable_irq (gpu->irq); +reset_control_assert (gpu->rst);clk_disable_unprepare (gpu->clk_shader);clk_disable_unprepare (gpu->clk_core);clk_disable_unprepare (gpu->clk_bus);@@ -1876,6 +1897,9 @@ static int etnaviv_gpu_platform_probe(struct
platform_device*pdev)drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_platform_probe(struct
Quoted 10 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3
-0if (gpu->irq <0 )return gpu->irq; +/* Avoid enabling the interrupt until everything is ready */ +irq_set_status_flags (gpu->irq,IRQ_NOAUTOEN ); + err =devm_request_irq (&pdev->dev, gpu->irq, irq_handler,0 ,dev_name (gpu->dev), gpu);if (err) {@@ -1883,6 +1907,12 @@ static int etnaviv_gpu_platform_probe(struct
platform_device*pdev)Review
Quoted 13 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +6
-0return err; } +/* Get Reset: */ + gpu->rst =devm_reset_control_get_optional (&pdev->dev,NULL ); +if (IS_ERR (gpu->rst)) +return dev_err_probe (dev,PTR_ERR (gpu->rst), +"failed to get reset\n" ); +/* Get Clocks: */ gpu->clk_reg =devm_clk_get_optional (&pdev->dev,"reg" );DBG ("clk_reg: %p" , gpu->clk_reg);(quoted diff) +0
-0
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
Quoted 14 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h line 4
Quoted 8 lines
index
31322195b9e4..8c181191755e100644drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales I don't think adding a single member here does warrant a Copyright statement, in fact I would prefer them to not be touched at all. Authorship of individual changes to the driver a clearly attributable via the git history.
I add these Copyright while following the rules to contribute to an OSS project from my company. After clarifications with the legal department, I will remove these changes in my next revision.
Regards,
Philippe
Quoted 13 lines
Regards,
LucasQuoted 11 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1
-0*/ #ifndef __ETNAVIV_GPU_H__@@ -157,6 +158,7 @@ struct etnaviv_gpu {struct clk *clk_reg;struct clk *clk_core;struct clk *clk_shader; +struct reset_control *rst;unsigned int freq_scale;unsigned int fe_waitcycles;
Lucas Stach
maintainerAm Donnerstag, dem 05.12.2024 um 15:06 +0000 schrieb LECOINTRE Philippe:
Quoted 99 lines
Hi Lucas,
I am grateful to you for your answer as this is my first attempt to contribute to the kernel.
Quoted 81 lines
-----Message d'origine-----
De : Lucas Stach <[email protected]>
Envoyé : mardi 3 décembre 2024 18:58
À : LECOINTRE Philippe <[email protected]>; Russell King <[email protected]>; Christian Gmeiner <[email protected]>
Cc : David Airlie <[email protected]>; Simona Vetter <[email protected]>; [email protected]; [email protected]; linux- [email protected]; LENAIN Simon <[email protected]>; BARBEAU Etienne <[email protected]>; LEJEUNE Sebastien <[email protected]>
Objet : Re: [PATCH v2] drm/etnaviv: add optional reset supportHi Philippe,
Am Freitag, dem 08.11.2024 um 14:00 +0000 schrieb LECOINTRE Philippe:
Quoted 11 lines
Add optional reset support which is mentioned in vivante,gc.yaml to allow the driver to work on SoCs whose reset signal is asserted by default Avoid enabling the interrupt until everything is ready
Signed-off-by Philippe Lecointre <[email protected]>Reviewed-by Simon Lenain <[email protected]>---
v2:
- Add missing include ofirq.h--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30+++++++++++++++++++++++++++
Review
Quoted 4 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 ++ 2 files changed, 32 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.cdrivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct
Quoted 26 lines
index
7c7f97793ddd..3e0c5dd9f74b100644drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales */ #include <linux/clk.h> @@ -8,11 +9,13 @@#include <linux/delay.h> #include <linux/dma-fence.h> #include <linux/dma-mapping.h> +#include <linux/irq.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/thermal.h> #include "etnaviv_cmdbuf.h" @@ -1629,8 +1632,24 @@ static int etnaviv_gpu_clk_enable(struct
etnaviv_gpu*gpu)drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)
Quoted 12 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +9
-0if (ret) goto disable_clk_core; +/* 32 core clock cycles (slowest clock) required before deassertion. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + + ret =reset_control_deassert (gpu->rst); +if (ret) + goto disable_clk_shader; + +/* 128 core clock cycles (slowest clock) required before any activity on AHB. */
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct · line 1645
Quoted 2 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0+/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 );Mashing the reset handling into the clock handling is a bad idea. The clocks are en-/disabled during runtime PM handling. The etnaviv driver is written in a way that the GPU does not necessarily need to be reset during a runtime PM transition, which allow for faster startup times.
Quoted 4 lines
The reset handling should really be its own separate function and would logically go into
etnaviv_gpu_init()between thepm_runtime_get_sync()andetnaviv_hw_identify().I will rework this part to match your feedback.
Quoted 6 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct · line 1647
Quoted 2 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0+ +enable_irq (gpu->irq);Do you see any issues with the IRQ being enabled earlier? A GPU being held in reset should not be able to trigger a IRQ.
Quoted 5 lines
I intend to avoid situations where IRQ are triggered for some reason and the GPU is not fully operational. Such issues might appear considering the state of reset and clocks from internal boot to kernel.
I assume this situation never appeared with SoCs that are using this driver at the moment.
But it appear on a SoC developed by an industrial partner, this lead to IRQ spamming with AXI bus error in the console.
It's a bit odd that your system might allow a device in undefined state (clocked, but not properly reset) onto the bus, as this might lead to many other issues aside from the asserted IRQ. I guess it would also be a good idea to assert the reset as soon as you requested it in etnaviv_gpu_platform_probe().
As we don't support shared IRQ lines for the GPU right now, it should be fine to request the IRQ with IRQF_NO_AUTOEN and then simply enable_irq() in etnaviv_gpu_init() after etnaviv_hw_reset(). This however should be a separate patch, so you end up with one patch adding the reset handling and one patch changing the IRQ enable flow.
Regards,
Lucas
Quoted 80 lines
Quoted 45 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_clk_enable(struct
Quoted 9 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3
-0+return 0 ; +disable_clk_shader: +clk_disable_unprepare (gpu->clk_shader); disable_clk_core:clk_disable_unprepare (gpu->clk_core); disable_clk_bus:@@ -1643,6 +1662,8 @@ static int etnaviv_gpu_clk_enable(struct
etnaviv_gpu*gpu)drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_platform_probe(struct
Quoted 9 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0static int etnaviv_gpu_clk_disable (struct etnaviv_gpu *gpu) { +disable_irq (gpu->irq); +reset_control_assert (gpu->rst);clk_disable_unprepare (gpu->clk_shader);clk_disable_unprepare (gpu->clk_core);clk_disable_unprepare (gpu->clk_bus);@@ -1876,6 +1897,9 @@ static int etnaviv_gpu_platform_probe(struct
platform_device*pdev)drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_platform_probe(struct
Quoted 10 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3
-0if (gpu->irq <0 )return gpu->irq; +/* Avoid enabling the interrupt until everything is ready */ +irq_set_status_flags (gpu->irq,IRQ_NOAUTOEN ); + err =devm_request_irq (&pdev->dev, gpu->irq, irq_handler,0 ,dev_name (gpu->dev), gpu);if (err) {@@ -1883,6 +1907,12 @@ static int etnaviv_gpu_platform_probe(struct
platform_device*pdev)Review
Quoted 13 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +6
-0return err; } +/* Get Reset: */ + gpu->rst =devm_reset_control_get_optional (&pdev->dev,NULL ); +if (IS_ERR (gpu->rst)) +return dev_err_probe (dev,PTR_ERR (gpu->rst), +"failed to get reset\n" ); +/* Get Clocks: */ gpu->clk_reg =devm_clk_get_optional (&pdev->dev,"reg" );DBG ("clk_reg: %p" , gpu->clk_reg);(quoted diff) +0
-0
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.hQuoted 14 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h line 4
Quoted 8 lines
index
31322195b9e4..8c181191755e100644drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales I don't think adding a single member here does warrant a Copyright statement, in fact I would prefer them to not be touched at all. Authorship of individual changes to the driver a clearly attributable via the git history.
I add these Copyright while following the rules to contribute to an OSS project from my company. After clarifications with the legal department, I will remove these changes in my next revision.
Regards,
PhilippeQuoted 13 lines
Regards,
LucasQuoted 11 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1
-0*/ #ifndef __ETNAVIV_GPU_H__@@ -157,6 +158,7 @@ struct etnaviv_gpu {struct clk *clk_reg;struct clk *clk_core;struct clk *clk_shader; +struct reset_control *rst;unsigned int freq_scale;unsigned int fe_waitcycles;
Quoted 85 lines · LECOINTRE Philippe
Add optional reset support which is mentioned in vivante,gc.yaml to allow the driver to work on SoCs whose reset signal is asserted by default Avoid enabling the interrupt until everything is ready
Signed-off-by Philippe Lecointre <[email protected]>Reviewed-by Simon Lenain <[email protected]>---
v2:
- Add missing include ofirq.h--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 +++++++++++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 ++ 2 files changed, 32 insertions(+)drivers/gpu/drm/etnaviv/etnaviv_gpu.c +24
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015-2018 Etnaviv Project +* Copyright (C) 2024 Thales */ #include <linux/clk.h> @@ -8,11 +9,13 @@#include <linux/delay.h> #include <linux/dma-fence.h> #include <linux/dma-mapping.h> +#include <linux/irq.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/thermal.h> #include "etnaviv_cmdbuf.h" @@ -1629,8 +1632,24 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)if (ret) goto disable_clk_core; +/* 32 core clock cycles (slowest clock) required before deassertion. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + + ret =reset_control_deassert (gpu->rst); +if (ret) + goto disable_clk_shader; + +/* 128 core clock cycles (slowest clock) required before any activity on AHB. */ +/* 1 microsecond might match all implementations */ +usleep_range (1 ,2 ); + +enable_irq (gpu->irq); +return 0 ; +disable_clk_shader: +clk_disable_unprepare (gpu->clk_shader); disable_clk_core:clk_disable_unprepare (gpu->clk_core); disable_clk_bus:@@ -1643,6 +1662,8 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)static int etnaviv_gpu_clk_disable (struct etnaviv_gpu *gpu) { +disable_irq (gpu->irq); +reset_control_assert (gpu->rst);clk_disable_unprepare (gpu->clk_shader);clk_disable_unprepare (gpu->clk_core);clk_disable_unprepare (gpu->clk_bus);@@ -1876,6 +1897,9 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)if (gpu->irq <0 )return gpu->irq; +/* Avoid enabling the interrupt until everything is ready */ +irq_set_status_flags (gpu->irq,IRQ_NOAUTOEN ); + err =devm_request_irq (&pdev->dev, gpu->irq, irq_handler,0 ,dev_name (gpu->dev), gpu);if (err) {
drivers/gpu/drm/etnaviv/etnaviv_gpu.c static int etnaviv_gpu_platform_probe(struct platform_device *pdev) · line 1911
Quoted 5 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2
-0@@ -1883,6 +1907,12 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)return err; } +/* Get Reset: */ + gpu->rst =devm_reset_control_get_optional (&pdev->dev,NULL );
Please use devm_reset_control_get_optional_exclusive() directly.
regards
Philipp