mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups
@ 2023-11-09  7:37 Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 01/11] drm/tidss: Use pm_runtime_resume_and_get() Tomi Valkeinen
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen, stable

While working on the TI BSP kernel, adding bootload splash screen
support, I noticed some issues with the driver and opportunities for
cleanups and improvements.

 Tomi

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
Changes in v2:
- Add missing pm_runtime_dont_use_autosuspend() in error path
- Add simple manual "reset" for K2G
- Leave tidss->dispc NULL if dispc_init fails
- Add Fixes tags
- Drop "drm/tidss: Add dispc_is_idle()"
- Add "drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY"
- Link to v1: https://lore.kernel.org/r/20231101-tidss-probe-v1-0-45149e0f9415@ideasonboard.com

---
Tomi Valkeinen (11):
      drm/tidss: Use pm_runtime_resume_and_get()
      drm/tidss: Use PM autosuspend
      drm/tidss: Drop useless variable init
      drm/tidss: Move reset to the end of dispc_init()
      drm/tidss: Return error value from from softreset
      drm/tidss: Check for K2G in in dispc_softreset()
      drm/tidss: Add simple K2G manual reset
      drm/tidss: Fix dss reset
      drm/tidss: IRQ code cleanup
      drm/tidss: Fix atomic_flush check
      drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY

 drivers/gpu/drm/tidss/tidss_crtc.c  | 12 ++----
 drivers/gpu/drm/tidss/tidss_dispc.c | 79 +++++++++++++++++++++++++++++++++----
 drivers/gpu/drm/tidss/tidss_drv.c   | 15 +++++--
 drivers/gpu/drm/tidss/tidss_irq.c   | 54 ++++---------------------
 drivers/gpu/drm/tidss/tidss_kms.c   |  2 +-
 5 files changed, 97 insertions(+), 65 deletions(-)
---
base-commit: 9d7c8c066916f231ca0ed4e4fce6c4b58ca3e451
change-id: 20231030-tidss-probe-854b1098c3af

Best regards,
-- 
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 01/11] drm/tidss: Use pm_runtime_resume_and_get()
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
@ 2023-11-09  7:37 ` Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 02/11] drm/tidss: Use PM autosuspend Tomi Valkeinen
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

Use pm_runtime_resume_and_get() instead of pm_runtime_get_sync(), which
will handle error situations better. Also fix the return, as there
should be no reason for the current complex return.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
index 4d063eb9cd0b..f403db11b846 100644
--- a/drivers/gpu/drm/tidss/tidss_drv.c
+++ b/drivers/gpu/drm/tidss/tidss_drv.c
@@ -32,9 +32,9 @@ int tidss_runtime_get(struct tidss_device *tidss)
 
 	dev_dbg(tidss->dev, "%s\n", __func__);
 
-	r = pm_runtime_get_sync(tidss->dev);
+	r = pm_runtime_resume_and_get(tidss->dev);
 	WARN_ON(r < 0);
-	return r < 0 ? r : 0;
+	return r;
 }
 
 void tidss_runtime_put(struct tidss_device *tidss)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 02/11] drm/tidss: Use PM autosuspend
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 01/11] drm/tidss: Use pm_runtime_resume_and_get() Tomi Valkeinen
@ 2023-11-09  7:37 ` Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 03/11] drm/tidss: Drop useless variable init Tomi Valkeinen
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

Use runtime PM autosuspend feature, with 1s timeout, to avoid
unnecessary suspend-resume cycles when, e.g. the userspace temporarily
turns off the crtcs when configuring the outputs.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_drv.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
index f403db11b846..f51c87e26e10 100644
--- a/drivers/gpu/drm/tidss/tidss_drv.c
+++ b/drivers/gpu/drm/tidss/tidss_drv.c
@@ -43,7 +43,9 @@ void tidss_runtime_put(struct tidss_device *tidss)
 
 	dev_dbg(tidss->dev, "%s\n", __func__);
 
-	r = pm_runtime_put_sync(tidss->dev);
+	pm_runtime_mark_last_busy(tidss->dev);
+
+	r = pm_runtime_put_autosuspend(tidss->dev);
 	WARN_ON(r < 0);
 }
 
@@ -144,6 +146,9 @@ static int tidss_probe(struct platform_device *pdev)
 
 	pm_runtime_enable(dev);
 
+	pm_runtime_set_autosuspend_delay(dev, 1000);
+	pm_runtime_use_autosuspend(dev);
+
 #ifndef CONFIG_PM
 	/* If we don't have PM, we need to call resume manually */
 	dispc_runtime_resume(tidss->dispc);
@@ -192,6 +197,7 @@ static int tidss_probe(struct platform_device *pdev)
 #ifndef CONFIG_PM
 	dispc_runtime_suspend(tidss->dispc);
 #endif
+	pm_runtime_dont_use_autosuspend(dev);
 	pm_runtime_disable(dev);
 
 	return ret;
@@ -215,6 +221,7 @@ static void tidss_remove(struct platform_device *pdev)
 	/* If we don't have PM, we need to call suspend manually */
 	dispc_runtime_suspend(tidss->dispc);
 #endif
+	pm_runtime_dont_use_autosuspend(dev);
 	pm_runtime_disable(dev);
 
 	/* devm allocated dispc goes away with the dev so mark it NULL */

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 03/11] drm/tidss: Drop useless variable init
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 01/11] drm/tidss: Use pm_runtime_resume_and_get() Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 02/11] drm/tidss: Use PM autosuspend Tomi Valkeinen
@ 2023-11-09  7:37 ` Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 04/11] drm/tidss: Move reset to the end of dispc_init() Tomi Valkeinen
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

No need to initialize the ret to 0 in dispc_softreset().

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index 9d9dee7abaef..ad7999434299 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2705,7 +2705,7 @@ static void dispc_init_errata(struct dispc_device *dispc)
 static void dispc_softreset(struct dispc_device *dispc)
 {
 	u32 val;
-	int ret = 0;
+	int ret;
 
 	/* Soft reset */
 	REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 04/11] drm/tidss: Move reset to the end of dispc_init()
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (2 preceding siblings ...)
  2023-11-09  7:37 ` [PATCH v2 03/11] drm/tidss: Drop useless variable init Tomi Valkeinen
@ 2023-11-09  7:37 ` Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 05/11] drm/tidss: Return error value from from softreset Tomi Valkeinen
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

We do a DSS reset in the middle of the dispc_init(). While that happens
to work now, we should really make sure that e..g the fclk, which is
acquired only later in the function, is enabled when doing a reset. This
will be handled in a later patch, but for now, let's move the
dispc_softreset() call to the end of dispc_init(), which is a sensible
place for it anyway.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index ad7999434299..deb665d0ede8 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2777,10 +2777,6 @@ int dispc_init(struct tidss_device *tidss)
 			return r;
 	}
 
-	/* K2G display controller does not support soft reset */
-	if (feat->subrev != DISPC_K2G)
-		dispc_softreset(dispc);
-
 	for (i = 0; i < dispc->feat->num_vps; i++) {
 		u32 gamma_size = dispc->feat->vp_feat.color.gamma_size;
 		u32 *gamma_table;
@@ -2829,6 +2825,10 @@ int dispc_init(struct tidss_device *tidss)
 	of_property_read_u32(dispc->dev->of_node, "max-memory-bandwidth",
 			     &dispc->memory_bandwidth_limit);
 
+	/* K2G display controller does not support soft reset */
+	if (feat->subrev != DISPC_K2G)
+		dispc_softreset(dispc);
+
 	tidss->dispc = dispc;
 
 	return 0;

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 05/11] drm/tidss: Return error value from from softreset
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (3 preceding siblings ...)
  2023-11-09  7:37 ` [PATCH v2 04/11] drm/tidss: Move reset to the end of dispc_init() Tomi Valkeinen
@ 2023-11-09  7:37 ` Tomi Valkeinen
  2023-11-09  7:37 ` [PATCH v2 06/11] drm/tidss: Check for K2G in in dispc_softreset() Tomi Valkeinen
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

Return an error value from dispc_softreset() so that the caller can
handle the errors.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index deb665d0ede8..50b475b285d9 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2702,7 +2702,7 @@ static void dispc_init_errata(struct dispc_device *dispc)
 	}
 }
 
-static void dispc_softreset(struct dispc_device *dispc)
+static int dispc_softreset(struct dispc_device *dispc)
 {
 	u32 val;
 	int ret;
@@ -2712,8 +2712,12 @@ static void dispc_softreset(struct dispc_device *dispc)
 	/* Wait for reset to complete */
 	ret = readl_poll_timeout(dispc->base_common + DSS_SYSSTATUS,
 				 val, val & 1, 100, 5000);
-	if (ret)
-		dev_warn(dispc->dev, "failed to reset dispc\n");
+	if (ret) {
+		dev_err(dispc->dev, "failed to reset dispc\n");
+		return ret;
+	}
+
+	return 0;
 }
 
 int dispc_init(struct tidss_device *tidss)
@@ -2826,8 +2830,11 @@ int dispc_init(struct tidss_device *tidss)
 			     &dispc->memory_bandwidth_limit);
 
 	/* K2G display controller does not support soft reset */
-	if (feat->subrev != DISPC_K2G)
-		dispc_softreset(dispc);
+	if (feat->subrev != DISPC_K2G) {
+		r = dispc_softreset(dispc);
+		if (r)
+			return r;
+	}
 
 	tidss->dispc = dispc;
 

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 06/11] drm/tidss: Check for K2G in in dispc_softreset()
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (4 preceding siblings ...)
  2023-11-09  7:37 ` [PATCH v2 05/11] drm/tidss: Return error value from from softreset Tomi Valkeinen
@ 2023-11-09  7:37 ` Tomi Valkeinen
  2023-11-09  7:38 ` [PATCH v2 07/11] drm/tidss: Add simple K2G manual reset Tomi Valkeinen
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:37 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

K2G doesn't have softreset feature. Instead of having every caller of
dispc_softreset() check for K2G, move the check into dispc_softreset(),
and make dispc_softreset() return 0 in case of K2G.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index 50b475b285d9..c82fd5bc9be4 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2707,6 +2707,10 @@ static int dispc_softreset(struct dispc_device *dispc)
 	u32 val;
 	int ret;
 
+	/* K2G display controller does not support soft reset */
+	if (dispc->feat->subrev == DISPC_K2G)
+		return 0;
+
 	/* Soft reset */
 	REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);
 	/* Wait for reset to complete */
@@ -2829,12 +2833,9 @@ int dispc_init(struct tidss_device *tidss)
 	of_property_read_u32(dispc->dev->of_node, "max-memory-bandwidth",
 			     &dispc->memory_bandwidth_limit);
 
-	/* K2G display controller does not support soft reset */
-	if (feat->subrev != DISPC_K2G) {
-		r = dispc_softreset(dispc);
-		if (r)
-			return r;
-	}
+	r = dispc_softreset(dispc);
+	if (r)
+		return r;
 
 	tidss->dispc = dispc;
 

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 07/11] drm/tidss: Add simple K2G manual reset
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (5 preceding siblings ...)
  2023-11-09  7:37 ` [PATCH v2 06/11] drm/tidss: Check for K2G in in dispc_softreset() Tomi Valkeinen
@ 2023-11-09  7:38 ` Tomi Valkeinen
  2023-11-09  7:38 ` [PATCH v2 08/11] drm/tidss: Fix dss reset Tomi Valkeinen
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:38 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

K2G display controller does not support soft reset, but we can do the
most important steps manually: mask the IRQs and disable the VPs.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index c82fd5bc9be4..a5c0b72596e8 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2702,14 +2702,28 @@ static void dispc_init_errata(struct dispc_device *dispc)
 	}
 }
 
+/*
+ * K2G display controller does not support soft reset, so we do a basic manual
+ * reset here: make sure the IRQs are masked and VPs are disabled.
+ */
+static void dispc_softreset_k2g(struct dispc_device *dispc)
+{
+	dispc_set_irqenable(dispc, 0);
+	dispc_read_and_clear_irqstatus(dispc);
+
+	for (unsigned int vp_idx = 0; vp_idx < dispc->feat->num_vps; ++vp_idx)
+		VP_REG_FLD_MOD(dispc, vp_idx, DISPC_VP_CONTROL, 0, 0, 0);
+}
+
 static int dispc_softreset(struct dispc_device *dispc)
 {
 	u32 val;
 	int ret;
 
-	/* K2G display controller does not support soft reset */
-	if (dispc->feat->subrev == DISPC_K2G)
+	if (dispc->feat->subrev == DISPC_K2G) {
+		dispc_softreset_k2g(dispc);
 		return 0;
+	}
 
 	/* Soft reset */
 	REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 08/11] drm/tidss: Fix dss reset
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (6 preceding siblings ...)
  2023-11-09  7:38 ` [PATCH v2 07/11] drm/tidss: Add simple K2G manual reset Tomi Valkeinen
@ 2023-11-09  7:38 ` Tomi Valkeinen
  2023-11-09  7:38 ` [PATCH v2 09/11] drm/tidss: IRQ code cleanup Tomi Valkeinen
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:38 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

The probe function calls dispc_softreset() before runtime PM is enabled
and without enabling any of the DSS clocks. This happens to work by
luck, and we need to make sure the DSS HW is active and the fclk is
enabled.

To fix the above, add a new function, dispc_init_hw(), which does:

- pm_runtime_set_active()
- clk_prepare_enable(fclk)
- dispc_softreset().

This ensures that the reset can be successfully accomplished.

Note that we use pm_runtime_set_active(), not the normal
pm_runtime_get(). The reason for this is that at this point we haven't
enabled the runtime PM yet and also we don't want the normal resume
callback to be called: the dispc resume callback does some initial HW
setup, and it expects that the HW was off (no video ports are
streaming). If the bootloader has enabled the DSS and has set up a
boot time splash-screen, the DSS would be enabled and streaming which
might lead to issues with the normal resume callback.

Fixes: c9b2d923befd ("drm/tidss: Soft Reset DISPC on startup")
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 45 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index a5c0b72596e8..8d6ac618c539 100644
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2738,6 +2738,49 @@ static int dispc_softreset(struct dispc_device *dispc)
 	return 0;
 }
 
+static int dispc_init_hw(struct dispc_device *dispc)
+{
+	struct device *dev = dispc->dev;
+	int ret;
+
+	ret = pm_runtime_set_active(dev);
+	if (ret) {
+		dev_err(dev, "Failed to set DSS PM to active\n");
+		return ret;
+	}
+
+	ret = clk_prepare_enable(dispc->fclk);
+	if (ret) {
+		dev_err(dev, "Failed to enable DSS fclk\n");
+		goto err_runtime_suspend;
+	}
+
+	ret = dispc_softreset(dispc);
+	if (ret)
+		goto err_clk_disable;
+
+	clk_disable_unprepare(dispc->fclk);
+	ret = pm_runtime_set_suspended(dev);
+	if (ret) {
+		dev_err(dev, "Failed to set DSS PM to suspended\n");
+		return ret;
+	}
+
+	return 0;
+
+err_clk_disable:
+	clk_disable_unprepare(dispc->fclk);
+
+err_runtime_suspend:
+	ret = pm_runtime_set_suspended(dev);
+	if (ret) {
+		dev_err(dev, "Failed to set DSS PM to suspended\n");
+		return ret;
+	}
+
+	return ret;
+}
+
 int dispc_init(struct tidss_device *tidss)
 {
 	struct device *dev = tidss->dev;
@@ -2847,7 +2890,7 @@ int dispc_init(struct tidss_device *tidss)
 	of_property_read_u32(dispc->dev->of_node, "max-memory-bandwidth",
 			     &dispc->memory_bandwidth_limit);
 
-	r = dispc_softreset(dispc);
+	r = dispc_init_hw(dispc);
 	if (r)
 		return r;
 

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 09/11] drm/tidss: IRQ code cleanup
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (7 preceding siblings ...)
  2023-11-09  7:38 ` [PATCH v2 08/11] drm/tidss: Fix dss reset Tomi Valkeinen
@ 2023-11-09  7:38 ` Tomi Valkeinen
  2023-11-09  7:38 ` [PATCH v2 10/11] drm/tidss: Fix atomic_flush check Tomi Valkeinen
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:38 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

The IRQ setup code is overly complex. All we really need to do is
initialize the related fields in struct tidss_device, and request the
IRQ.

We can drop all the HW accesses, as they are pointless: the driver will
set the IRQs correctly when it needs any of the IRQs, and at probe time
we have done a reset, so we know that all the IRQs are masked by default
in the hardware.

Thus we can combine the tidss_irq_preinstall() and
tidss_irq_postinstall() into the tidss_irq_install() function, drop the
HW accesses, and drop the use of spinlock, as this is done at init time
and there can be no races.

We can also drop the HW access from the tidss_irq_uninstall(), as the
driver will anyway disable and suspend the hardware at remove time.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_drv.c |  2 ++
 drivers/gpu/drm/tidss/tidss_irq.c | 54 ++++++---------------------------------
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
index f51c87e26e10..490d15ed2216 100644
--- a/drivers/gpu/drm/tidss/tidss_drv.c
+++ b/drivers/gpu/drm/tidss/tidss_drv.c
@@ -138,6 +138,8 @@ static int tidss_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, tidss);
 
+	spin_lock_init(&tidss->wait_lock);
+
 	ret = dispc_init(tidss);
 	if (ret) {
 		dev_err(dev, "failed to initialize dispc: %d\n", ret);
diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c
index 0c681c7600bc..604334ef526a 100644
--- a/drivers/gpu/drm/tidss/tidss_irq.c
+++ b/drivers/gpu/drm/tidss/tidss_irq.c
@@ -93,33 +93,21 @@ void tidss_irq_resume(struct tidss_device *tidss)
 	spin_unlock_irqrestore(&tidss->wait_lock, flags);
 }
 
-static void tidss_irq_preinstall(struct drm_device *ddev)
-{
-	struct tidss_device *tidss = to_tidss(ddev);
-
-	spin_lock_init(&tidss->wait_lock);
-
-	tidss_runtime_get(tidss);
-
-	dispc_set_irqenable(tidss->dispc, 0);
-	dispc_read_and_clear_irqstatus(tidss->dispc);
-
-	tidss_runtime_put(tidss);
-}
-
-static void tidss_irq_postinstall(struct drm_device *ddev)
+int tidss_irq_install(struct drm_device *ddev, unsigned int irq)
 {
 	struct tidss_device *tidss = to_tidss(ddev);
-	unsigned long flags;
-	unsigned int i;
+	int ret;
 
-	tidss_runtime_get(tidss);
+	if (irq == IRQ_NOTCONNECTED)
+		return -ENOTCONN;
 
-	spin_lock_irqsave(&tidss->wait_lock, flags);
+	ret = request_irq(irq, tidss_irq_handler, 0, ddev->driver->name, ddev);
+	if (ret)
+		return ret;
 
 	tidss->irq_mask = DSS_IRQ_DEVICE_OCP_ERR;
 
-	for (i = 0; i < tidss->num_crtcs; ++i) {
+	for (unsigned int i = 0; i < tidss->num_crtcs; ++i) {
 		struct tidss_crtc *tcrtc = to_tidss_crtc(tidss->crtcs[i]);
 
 		tidss->irq_mask |= DSS_IRQ_VP_SYNC_LOST(tcrtc->hw_videoport);
@@ -127,28 +115,6 @@ static void tidss_irq_postinstall(struct drm_device *ddev)
 		tidss->irq_mask |= DSS_IRQ_VP_FRAME_DONE(tcrtc->hw_videoport);
 	}
 
-	tidss_irq_update(tidss);
-
-	spin_unlock_irqrestore(&tidss->wait_lock, flags);
-
-	tidss_runtime_put(tidss);
-}
-
-int tidss_irq_install(struct drm_device *ddev, unsigned int irq)
-{
-	int ret;
-
-	if (irq == IRQ_NOTCONNECTED)
-		return -ENOTCONN;
-
-	tidss_irq_preinstall(ddev);
-
-	ret = request_irq(irq, tidss_irq_handler, 0, ddev->driver->name, ddev);
-	if (ret)
-		return ret;
-
-	tidss_irq_postinstall(ddev);
-
 	return 0;
 }
 
@@ -156,9 +122,5 @@ void tidss_irq_uninstall(struct drm_device *ddev)
 {
 	struct tidss_device *tidss = to_tidss(ddev);
 
-	tidss_runtime_get(tidss);
-	dispc_set_irqenable(tidss->dispc, 0);
-	tidss_runtime_put(tidss);
-
 	free_irq(tidss->irq, ddev);
 }

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 10/11] drm/tidss: Fix atomic_flush check
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (8 preceding siblings ...)
  2023-11-09  7:38 ` [PATCH v2 09/11] drm/tidss: IRQ code cleanup Tomi Valkeinen
@ 2023-11-09  7:38 ` Tomi Valkeinen
  2023-11-09  7:38 ` [PATCH v2 11/11] drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY Tomi Valkeinen
  2023-12-01  6:24 ` [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Aradhya Bhatia
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:38 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen, stable

tidss_crtc_atomic_flush() checks if the crtc is enabled, and if not,
returns immediately as there's no reason to do any register changes.

However, the code checks for 'crtc->state->enable', which does not
reflect the actual HW state. We should instead look at the
'crtc->state->active' flag.

This causes the tidss_crtc_atomic_flush() to proceed with the flush even
if the active state is false, which then causes us to hit the
WARN_ON(!crtc->state->event) check.

Fix this by checking the active flag, and while at it, fix the related
debug print which had "active" and "needs modeset" wrong way.

Cc: stable@vger.kernel.org
Fixes: 32a1795f57ee ("drm/tidss: New driver for TI Keystone platform Display SubSystem")
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_crtc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
index 5e5e466f35d1..7c78c074e3a2 100644
--- a/drivers/gpu/drm/tidss/tidss_crtc.c
+++ b/drivers/gpu/drm/tidss/tidss_crtc.c
@@ -169,13 +169,13 @@ static void tidss_crtc_atomic_flush(struct drm_crtc *crtc,
 	struct tidss_device *tidss = to_tidss(ddev);
 	unsigned long flags;
 
-	dev_dbg(ddev->dev,
-		"%s: %s enabled %d, needs modeset %d, event %p\n", __func__,
-		crtc->name, drm_atomic_crtc_needs_modeset(crtc->state),
-		crtc->state->enable, crtc->state->event);
+	dev_dbg(ddev->dev, "%s: %s is %sactive, %s modeset, event %p\n",
+		__func__, crtc->name, crtc->state->active ? "" : "not ",
+		drm_atomic_crtc_needs_modeset(crtc->state) ? "needs" : "doesn't need",
+		crtc->state->event);
 
 	/* There is nothing to do if CRTC is not going to be enabled. */
-	if (!crtc->state->enable)
+	if (!crtc->state->active)
 		return;
 
 	/*

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 11/11] drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (9 preceding siblings ...)
  2023-11-09  7:38 ` [PATCH v2 10/11] drm/tidss: Fix atomic_flush check Tomi Valkeinen
@ 2023-11-09  7:38 ` Tomi Valkeinen
  2023-12-01  6:24 ` [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Aradhya Bhatia
  11 siblings, 0 replies; 13+ messages in thread
From: Tomi Valkeinen @ 2023-11-09  7:38 UTC (permalink / raw)
  To: Aradhya Bhatia, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini,
	Tomi Valkeinen

At the moment the driver does not use DRM_PLANE_COMMIT_ACTIVE_ONLY, but
still checks for crtc->state->active in tidss_crtc_atomic_flush(), and
skips the flush if the crtc is not active.

The exact reason why DRM_PLANE_COMMIT_ACTIVE_ONLY is not used has been
lost in history. DRM_PLANE_COMMIT_ACTIVE_ONLY does also affect the plane
updates, and I think the issue was related to multi-display systems and
moving planes between the displays. However, it is possible the issue
was only present on the older DSS hardware, handled by the omapdrm
driver (on which the tidss driver is loosely based).

Reviewing the code related to DRM_PLANE_COMMIT_ACTIVE_ONLY does not show
any issues, and testing on J7 EVM with two displays works fine.

Change the driver to use DRM_PLANE_COMMIT_ACTIVE_ONLY.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/gpu/drm/tidss/tidss_crtc.c | 4 ----
 drivers/gpu/drm/tidss/tidss_kms.c  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
index 7c78c074e3a2..5f838980c7a1 100644
--- a/drivers/gpu/drm/tidss/tidss_crtc.c
+++ b/drivers/gpu/drm/tidss/tidss_crtc.c
@@ -174,10 +174,6 @@ static void tidss_crtc_atomic_flush(struct drm_crtc *crtc,
 		drm_atomic_crtc_needs_modeset(crtc->state) ? "needs" : "doesn't need",
 		crtc->state->event);
 
-	/* There is nothing to do if CRTC is not going to be enabled. */
-	if (!crtc->state->active)
-		return;
-
 	/*
 	 * Flush CRTC changes with go bit only if new modeset is not
 	 * coming, so CRTC is enabled trough out the commit.
diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c
index d096d8d2bc8f..a0e494c806a9 100644
--- a/drivers/gpu/drm/tidss/tidss_kms.c
+++ b/drivers/gpu/drm/tidss/tidss_kms.c
@@ -29,7 +29,7 @@ static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state)
 	tidss_runtime_get(tidss);
 
 	drm_atomic_helper_commit_modeset_disables(ddev, old_state);
-	drm_atomic_helper_commit_planes(ddev, old_state, 0);
+	drm_atomic_helper_commit_planes(ddev, old_state, DRM_PLANE_COMMIT_ACTIVE_ONLY);
 	drm_atomic_helper_commit_modeset_enables(ddev, old_state);
 
 	drm_atomic_helper_commit_hw_done(old_state);

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups
  2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
                   ` (10 preceding siblings ...)
  2023-11-09  7:38 ` [PATCH v2 11/11] drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY Tomi Valkeinen
@ 2023-12-01  6:24 ` Aradhya Bhatia
  11 siblings, 0 replies; 13+ messages in thread
From: Aradhya Bhatia @ 2023-12-01  6:24 UTC (permalink / raw)
  To: Tomi Valkeinen, Devarsh Thakkar, Jyri Sarha, Maarten Lankhorst,
	Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter
  Cc: dri-devel, linux-kernel, Laurent Pinchart, Francesco Dolcini, stable

Hi Tomi,

Thank you for the patches!

On 09/11/23 13:07, Tomi Valkeinen wrote:
> While working on the TI BSP kernel, adding bootload splash screen
> support, I noticed some issues with the driver and opportunities for
> cleanups and improvements.
> 
>  Tomi
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
> Changes in v2:
> - Add missing pm_runtime_dont_use_autosuspend() in error path
> - Add simple manual "reset" for K2G
> - Leave tidss->dispc NULL if dispc_init fails
> - Add Fixes tags
> - Drop "drm/tidss: Add dispc_is_idle()"
> - Add "drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY"
> - Link to v1: https://lore.kernel.org/r/20231101-tidss-probe-v1-0-45149e0f9415@ideasonboard.com
> 
> ---
> Tomi Valkeinen (11):
>       drm/tidss: Use pm_runtime_resume_and_get()
>       drm/tidss: Use PM autosuspend
>       drm/tidss: Drop useless variable init
>       drm/tidss: Move reset to the end of dispc_init()
>       drm/tidss: Return error value from from softreset
>       drm/tidss: Check for K2G in in dispc_softreset()
>       drm/tidss: Add simple K2G manual reset
>       drm/tidss: Fix dss reset
>       drm/tidss: IRQ code cleanup
>       drm/tidss: Fix atomic_flush check
>       drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY

For the series,

Reviewed-by: Aradhya Bhatia <a-bhatia1@ti.com>

Regards
Aradhya

> 
>  drivers/gpu/drm/tidss/tidss_crtc.c  | 12 ++----
>  drivers/gpu/drm/tidss/tidss_dispc.c | 79 +++++++++++++++++++++++++++++++++----
>  drivers/gpu/drm/tidss/tidss_drv.c   | 15 +++++--
>  drivers/gpu/drm/tidss/tidss_irq.c   | 54 ++++---------------------
>  drivers/gpu/drm/tidss/tidss_kms.c   |  2 +-
>  5 files changed, 97 insertions(+), 65 deletions(-)
> ---
> base-commit: 9d7c8c066916f231ca0ed4e4fce6c4b58ca3e451
> change-id: 20231030-tidss-probe-854b1098c3af
> 
> Best regards,

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-12-01  6:25 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-09  7:37 [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Tomi Valkeinen
2023-11-09  7:37 ` [PATCH v2 01/11] drm/tidss: Use pm_runtime_resume_and_get() Tomi Valkeinen
2023-11-09  7:37 ` [PATCH v2 02/11] drm/tidss: Use PM autosuspend Tomi Valkeinen
2023-11-09  7:37 ` [PATCH v2 03/11] drm/tidss: Drop useless variable init Tomi Valkeinen
2023-11-09  7:37 ` [PATCH v2 04/11] drm/tidss: Move reset to the end of dispc_init() Tomi Valkeinen
2023-11-09  7:37 ` [PATCH v2 05/11] drm/tidss: Return error value from from softreset Tomi Valkeinen
2023-11-09  7:37 ` [PATCH v2 06/11] drm/tidss: Check for K2G in in dispc_softreset() Tomi Valkeinen
2023-11-09  7:38 ` [PATCH v2 07/11] drm/tidss: Add simple K2G manual reset Tomi Valkeinen
2023-11-09  7:38 ` [PATCH v2 08/11] drm/tidss: Fix dss reset Tomi Valkeinen
2023-11-09  7:38 ` [PATCH v2 09/11] drm/tidss: IRQ code cleanup Tomi Valkeinen
2023-11-09  7:38 ` [PATCH v2 10/11] drm/tidss: Fix atomic_flush check Tomi Valkeinen
2023-11-09  7:38 ` [PATCH v2 11/11] drm/tidss: Use DRM_PLANE_COMMIT_ACTIVE_ONLY Tomi Valkeinen
2023-12-01  6:24 ` [PATCH v2 00/11] drm/tidss: Probe related fixes and cleanups Aradhya Bhatia

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®