Skip to contentSkip to conversation

drm/tidss: Soft Reset DISPC on startup

PATCH In review Devarsh Thakkar 4 participants 6 messages Mar 14, 2022 – Apr 19, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/tidss: Soft Reset DISPC on startup

Soft reset the display subsystem controller on startup and wait for the reset to complete. This helps the scenario where display was already in use by some other core before the linux was booted.

---
 drivers/gpu/drm/tidss/tidss_dispc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/gpu/drm/tidss/tidss_dispc.c +18 -0
index 60b92df615aa..dae47853b728 100644
@@ -2650,6 +2650,20 @@ static void dispc_init_errata(struct dispc_device *dispc)
 	}
 }
 
+static void dispc_softreset(struct dispc_device *dispc)
+{
+	u32 val;
+	int ret = 0;
+
+	/* Soft reset */
+	REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);
+	/* 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");
+}
+
 int dispc_init(struct tidss_device *tidss)
 {
 	struct device *dev = tidss->dev;
@@ -2709,6 +2723,10 @@ 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;
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

Hi Laurent, Tomi,

Quoted 3 lines · Devarsh Thakkar

Soft reset the display subsystem controller on startup and wait for the reset to complete. This helps the scenario where display was already in use by some other core before the linux was booted.

Could you please help review this patch ?

Regards,

Devarsh

Quoted 41 lines
---
 drivers/gpu/drm/tidss/tidss_dispc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/gpu/drm/tidss/tidss_dispc.c +18 -0
index 60b92df615aa..dae47853b728 100644
@@ -2650,6 +2650,20 @@ static void dispc_init_errata(struct dispc_device *dispc)
 	}
 }
 
+static void dispc_softreset(struct dispc_device *dispc)
+{
+	u32 val;
+	int ret = 0;
+
+	/* Soft reset */
+	REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);
+	/* 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");
+}
+
 int dispc_init(struct tidss_device *tidss)
 {
 	struct device *dev = tidss->dev;
@@ -2709,6 +2723,10 @@ 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;
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Devarsh Thakkar

Hi,

Quoted 3 lines · Devarsh Thakkar

Soft reset the display subsystem controller on startup and wait for the reset to complete. This helps the scenario where display was already in use by some other core before the linux was booted.

The reason the omapdrm doesn't do a reset is that the PM features on some of the DSS registers were set and controlled outside dss driver, so the dss driver could not do a reset just like that. That design was carried to the tidss driver, although I'm not sure if the reason is valid on AM6 and J7 platforms.

If that reasoning is not valid, this patch is ok and:

Tomi

Quoted 41 lines
---
  drivers/gpu/drm/tidss/tidss_dispc.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
drivers/gpu/drm/tidss/tidss_dispc.c +18 -0
index 60b92df615aa..dae47853b728 100644
@@ -2650,6 +2650,20 @@ static void dispc_init_errata(struct dispc_device *dispc)
  	}
  }
 
+static void dispc_softreset(struct dispc_device *dispc)
+{
+	u32 val;
+	int ret = 0;
+
+	/* Soft reset */
+	REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1);
+	/* 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");
+}
+
  int dispc_init(struct tidss_device *tidss)
  {
  	struct device *dev = tidss->dev;
@@ -2709,6 +2723,10 @@ 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;
#3 lore raw
Quoted 13 lines · Tomi Valkeinen

Hi,

Quoted 3 lines · Devarsh Thakkar

Soft reset the display subsystem controller on startup and wait for the reset to complete. This helps the scenario where display was already in use by some other core before the linux was booted.

The reason the omapdrm doesn't do a reset is that the PM features on some of the DSS registers were set and controlled outside dss driver, so the dss driver could not do a reset just like that. That design was carried to the tidss driver, although I'm not sure if the reason is valid on AM6 and J7 platforms.

Quoted 4 lines

If that reasoning is not valid, this patch is ok and:

Tony - sysc control for older omap devices still control this directly?

Signature · 8 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#4 lore raw
Quoted 14 lines · Nishanth Menon
Quoted 13 lines · Tomi Valkeinen

Hi,

Quoted 3 lines · Devarsh Thakkar

Soft reset the display subsystem controller on startup and wait for the reset to complete. This helps the scenario where display was already in use by some other core before the linux was booted.

The reason the omapdrm doesn't do a reset is that the PM features on some of the DSS registers were set and controlled outside dss driver, so the dss driver could not do a reset just like that. That design was carried to the tidss driver, although I'm not sure if the reason is valid on AM6 and J7 platforms.

Quoted 3 lines
Quoted 3 lines

If that reasoning is not valid, this patch is ok and:

Yeah seems OK to me for tidss, I don't think there's any other layer to do this in a generic way for k3 devices currently.

The thing to check here is that the sysconfig register gets properly initialized to the right state after reset. For PM, likely the syconfig value after reset is not correct, but that can be reconfigured later on as needed.

Quoted 1 line

Tony - sysc control for older omap devices still control this directly?

Yes, for a reason. The reset affects the entire interconnect target module, and disabling clockdomain autoidle needs to be considered for enable. For omaps, the resets are handled in a generic way for all the TI devices by ti-sysc.

With ti-sysc, the reset is done before probing dss devices on init in sysc_init_module(). The dss related quirk handling is done in sysc_pre_reset_quirk_dss(). If needed, we could add support for reset framework to ti-sysc for omapdrm to call. But so far there has not been much of a need for that, I think 8250_omap could use reset framework if available though.

Anyways, sounds like there's no need to do a similar dss reset in omapdrm.

Regards,

Tony

maintainer
#5 lore raw
In reply to Devarsh Thakkar
Quoted 9 lines · Devarsh Thakkar

Soft reset the display subsystem controller on startup and wait for the reset to complete. This helps the scenario where display was already in use by some other core before the linux was booted.

---
  drivers/gpu/drm/tidss/tidss_dispc.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)

Thanks, I have pushed this to drm-misc-next.

Tomi