| Message ID | 20240513021849.129136-1-marex@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm: bridge: samsung-dsim: Initialize bridge on attach | expand |
On 13.05.2024 04:16, Marek Vasut wrote: > Initialize the bridge on attach already, to force lanes into LP11 > state, since attach does trigger attach of downstream bridges which > may trigger (e)DP AUX channel mode read. > > This fixes a corner case where DSIM with TC9595 attached to it fails > to operate the DP AUX channel, because the TC9595 enters some debug > mode when it is released from reset without lanes in LP11 mode. By > ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) > can be reset in its attach callback called from DSIM attach callback, > and recovered out of the debug mode just before TC9595 performs first > AUX channel access later in its attach callback. > > Signed-off-by: Marek Vasut <marex@denx.de> This patch breaks driver operation on Samsung TM2e board with S6E3HF2 DSI panel. The initialization procedure is very fragile and it looks that the changes must be done very carefully. We discussed this many times when converting this driver from Exynos DSI to generic Samsung DSI used on IMX and other SoCs. > --- > Cc: Adam Ford <aford173@gmail.com> > Cc: Alexander Stein <alexander.stein@ew.tq-group.com> > Cc: Andrzej Hajda <andrzej.hajda@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: David Airlie <airlied@gmail.com> > Cc: Frieder Schrempf <frieder.schrempf@kontron.de> > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Jagan Teki <jagan@amarulasolutions.com> > Cc: Jernej Skrabec <jernej.skrabec@gmail.com> > Cc: Jonas Karlman <jonas@kwiboo.se> > Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> > Cc: Lucas Stach <l.stach@pengutronix.de> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Michael Walle <mwalle@kernel.org> > Cc: Neil Armstrong <neil.armstrong@linaro.org> > Cc: Robert Foss <rfoss@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: dri-devel@lists.freedesktop.org > Cc: kernel@dh-electronics.com > --- > drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index 95fedc68b0ae5..56093fc3d62cc 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -1622,9 +1622,21 @@ static int samsung_dsim_attach(struct drm_bridge *bridge, > enum drm_bridge_attach_flags flags) > { > struct samsung_dsim *dsi = bridge_to_dsi(bridge); > + int ret; > + > + ret = pm_runtime_resume_and_get(dsi->dev); > + if (ret < 0) > + return ret; > > - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, > - flags); > + ret = samsung_dsim_init(dsi); > + if (ret < 0) > + goto err; > + > + ret = drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, > + flags); > +err: > + pm_runtime_put_sync(dsi->dev); > + return ret; > } > > static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { Best regards
On 5/13/24 9:57 AM, Marek Szyprowski wrote: > > On 13.05.2024 04:16, Marek Vasut wrote: >> Initialize the bridge on attach already, to force lanes into LP11 >> state, since attach does trigger attach of downstream bridges which >> may trigger (e)DP AUX channel mode read. >> >> This fixes a corner case where DSIM with TC9595 attached to it fails >> to operate the DP AUX channel, because the TC9595 enters some debug >> mode when it is released from reset without lanes in LP11 mode. By >> ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) >> can be reset in its attach callback called from DSIM attach callback, >> and recovered out of the debug mode just before TC9595 performs first >> AUX channel access later in its attach callback. >> >> Signed-off-by: Marek Vasut <marex@denx.de> > > This patch breaks driver operation on Samsung TM2e board with S6E3HF2 > DSI panel. The initialization procedure is very fragile and it looks > that the changes must be done very carefully. We discussed this many > times when converting this driver from Exynos DSI to generic Samsung DSI > used on IMX and other SoCs. Clearly we need to find a way to support both use cases . What options do we have ? Does the panel require DSI lanes in some specific state when it is released from reset ?
Hi Marek, thanks for the patch. Am Montag, 13. Mai 2024, 04:16:27 CEST schrieb Marek Vasut: > Initialize the bridge on attach already, to force lanes into LP11 > state, since attach does trigger attach of downstream bridges which > may trigger (e)DP AUX channel mode read. > > This fixes a corner case where DSIM with TC9595 attached to it fails > to operate the DP AUX channel, because the TC9595 enters some debug > mode when it is released from reset without lanes in LP11 mode. By > ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) > can be reset in its attach callback called from DSIM attach callback, > and recovered out of the debug mode just before TC9595 performs first > AUX channel access later in its attach callback. > > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Adam Ford <aford173@gmail.com> > Cc: Alexander Stein <alexander.stein@ew.tq-group.com> > Cc: Andrzej Hajda <andrzej.hajda@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: David Airlie <airlied@gmail.com> > Cc: Frieder Schrempf <frieder.schrempf@kontron.de> > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Jagan Teki <jagan@amarulasolutions.com> > Cc: Jernej Skrabec <jernej.skrabec@gmail.com> > Cc: Jonas Karlman <jonas@kwiboo.se> > Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> > Cc: Lucas Stach <l.stach@pengutronix.de> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Michael Walle <mwalle@kernel.org> > Cc: Neil Armstrong <neil.armstrong@linaro.org> > Cc: Robert Foss <rfoss@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: dri-devel@lists.freedesktop.org > Cc: kernel@dh-electronics.com > --- > drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index 95fedc68b0ae5..56093fc3d62cc 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -1622,9 +1622,21 @@ static int samsung_dsim_attach(struct drm_bridge *bridge, > enum drm_bridge_attach_flags flags) > { > struct samsung_dsim *dsi = bridge_to_dsi(bridge); > + int ret; > + > + ret = pm_runtime_resume_and_get(dsi->dev); > + if (ret < 0) > + return ret; > > - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, > - flags); > + ret = samsung_dsim_init(dsi); > + if (ret < 0) > + goto err; > + > + ret = drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, > + flags); > +err: > + pm_runtime_put_sync(dsi->dev); > + return ret; > } > > static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { > It seems the right thing to do. But if 'samsung,burst-clock-frequency' is not specified for DSIM I get a DSI PLL configuration failure. There is no mode yet, thus samsung_dsim_enable_clock() tries to configure the PLL for 0Hz. There is another reconfiguration while pre_enabling the chain targeting the correct clock (891000000Hz for 1920x1080), so this seems fine. But I'm not sure if the 1st config error has any negative side effects. Best regards, Alexander
Hi, Am Montag, 13. Mai 2024, 04:16:27 CEST schrieb Marek Vasut: > Initialize the bridge on attach already, to force lanes into LP11 > state, since attach does trigger attach of downstream bridges which > may trigger (e)DP AUX channel mode read. > > This fixes a corner case where DSIM with TC9595 attached to it fails > to operate the DP AUX channel, because the TC9595 enters some debug > mode when it is released from reset without lanes in LP11 mode. By > ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) > can be reset in its attach callback called from DSIM attach callback, > and recovered out of the debug mode just before TC9595 performs first > AUX channel access later in its attach callback. > > Signed-off-by: Marek Vasut <marex@denx.de> This does the trick on my hardware as well. Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com> > --- > Cc: Adam Ford <aford173@gmail.com> > Cc: Alexander Stein <alexander.stein@ew.tq-group.com> > Cc: Andrzej Hajda <andrzej.hajda@intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: David Airlie <airlied@gmail.com> > Cc: Frieder Schrempf <frieder.schrempf@kontron.de> > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Jagan Teki <jagan@amarulasolutions.com> > Cc: Jernej Skrabec <jernej.skrabec@gmail.com> > Cc: Jonas Karlman <jonas@kwiboo.se> > Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> > Cc: Lucas Stach <l.stach@pengutronix.de> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Michael Walle <mwalle@kernel.org> > Cc: Neil Armstrong <neil.armstrong@linaro.org> > Cc: Robert Foss <rfoss@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: dri-devel@lists.freedesktop.org > Cc: kernel@dh-electronics.com > --- > drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index 95fedc68b0ae5..56093fc3d62cc 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -1622,9 +1622,21 @@ static int samsung_dsim_attach(struct drm_bridge *bridge, > enum drm_bridge_attach_flags flags) > { > struct samsung_dsim *dsi = bridge_to_dsi(bridge); > + int ret; > + > + ret = pm_runtime_resume_and_get(dsi->dev); > + if (ret < 0) > + return ret; > > - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, > - flags); > + ret = samsung_dsim_init(dsi); > + if (ret < 0) > + goto err; > + > + ret = drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, > + flags); > +err: > + pm_runtime_put_sync(dsi->dev); > + return ret; > } > > static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { > >
On 6/24/24 11:26 AM, Alexander Stein wrote: Hello Alexander, > Am Montag, 13. Mai 2024, 04:16:27 CEST schrieb Marek Vasut: >> Initialize the bridge on attach already, to force lanes into LP11 >> state, since attach does trigger attach of downstream bridges which >> may trigger (e)DP AUX channel mode read. >> >> This fixes a corner case where DSIM with TC9595 attached to it fails >> to operate the DP AUX channel, because the TC9595 enters some debug >> mode when it is released from reset without lanes in LP11 mode. By >> ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) >> can be reset in its attach callback called from DSIM attach callback, >> and recovered out of the debug mode just before TC9595 performs first >> AUX channel access later in its attach callback. >> >> Signed-off-by: Marek Vasut <marex@denx.de> > > This does the trick on my hardware as well. > Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com> Thank you. I still have to address your previous comment on 1/2, I didn't get to that one yet, sorry. Also, I am not sure if this should be applied as-is, it is a borderline workaround and there was some discussion about fixing the LP11 lane mode switch properly. Michael ?
On 5/16/24 8:51 AM, Alexander Stein wrote: > Hi Marek, > > thanks for the patch. > > Am Montag, 13. Mai 2024, 04:16:27 CEST schrieb Marek Vasut: >> Initialize the bridge on attach already, to force lanes into LP11 >> state, since attach does trigger attach of downstream bridges which >> may trigger (e)DP AUX channel mode read. >> >> This fixes a corner case where DSIM with TC9595 attached to it fails >> to operate the DP AUX channel, because the TC9595 enters some debug >> mode when it is released from reset without lanes in LP11 mode. By >> ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) >> can be reset in its attach callback called from DSIM attach callback, >> and recovered out of the debug mode just before TC9595 performs first >> AUX channel access later in its attach callback. >> >> Signed-off-by: Marek Vasut <marex@denx.de> >> --- >> Cc: Adam Ford <aford173@gmail.com> >> Cc: Alexander Stein <alexander.stein@ew.tq-group.com> >> Cc: Andrzej Hajda <andrzej.hajda@intel.com> >> Cc: Daniel Vetter <daniel@ffwll.ch> >> Cc: David Airlie <airlied@gmail.com> >> Cc: Frieder Schrempf <frieder.schrempf@kontron.de> >> Cc: Inki Dae <inki.dae@samsung.com> >> Cc: Jagan Teki <jagan@amarulasolutions.com> >> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> >> Cc: Jonas Karlman <jonas@kwiboo.se> >> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> >> Cc: Lucas Stach <l.stach@pengutronix.de> >> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >> Cc: Marek Szyprowski <m.szyprowski@samsung.com> >> Cc: Maxime Ripard <mripard@kernel.org> >> Cc: Michael Walle <mwalle@kernel.org> >> Cc: Neil Armstrong <neil.armstrong@linaro.org> >> Cc: Robert Foss <rfoss@kernel.org> >> Cc: Thomas Zimmermann <tzimmermann@suse.de> >> Cc: dri-devel@lists.freedesktop.org >> Cc: kernel@dh-electronics.com >> --- >> drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- >> 1 file changed, 14 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c >> index 95fedc68b0ae5..56093fc3d62cc 100644 >> --- a/drivers/gpu/drm/bridge/samsung-dsim.c >> +++ b/drivers/gpu/drm/bridge/samsung-dsim.c >> @@ -1622,9 +1622,21 @@ static int samsung_dsim_attach(struct drm_bridge *bridge, >> enum drm_bridge_attach_flags flags) >> { >> struct samsung_dsim *dsi = bridge_to_dsi(bridge); >> + int ret; >> + >> + ret = pm_runtime_resume_and_get(dsi->dev); >> + if (ret < 0) >> + return ret; >> >> - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, >> - flags); >> + ret = samsung_dsim_init(dsi); >> + if (ret < 0) >> + goto err; >> + >> + ret = drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, >> + flags); >> +err: >> + pm_runtime_put_sync(dsi->dev); >> + return ret; >> } >> >> static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { >> > > It seems the right thing to do. But if 'samsung,burst-clock-frequency' is > not specified for DSIM I get a DSI PLL configuration failure. There is no > mode yet, thus samsung_dsim_enable_clock() tries to configure the PLL for > 0Hz. There is another reconfiguration while pre_enabling the chain targeting > the correct clock (891000000Hz for 1920x1080), so this seems fine. > But I'm not sure if the 1st config error has any negative side effects. Will be fixed in V2, thanks for pointing this out.
diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 95fedc68b0ae5..56093fc3d62cc 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1622,9 +1622,21 @@ static int samsung_dsim_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) { struct samsung_dsim *dsi = bridge_to_dsi(bridge); + int ret; + + ret = pm_runtime_resume_and_get(dsi->dev); + if (ret < 0) + return ret; - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, - flags); + ret = samsung_dsim_init(dsi); + if (ret < 0) + goto err; + + ret = drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, + flags); +err: + pm_runtime_put_sync(dsi->dev); + return ret; } static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = {
Initialize the bridge on attach already, to force lanes into LP11 state, since attach does trigger attach of downstream bridges which may trigger (e)DP AUX channel mode read. This fixes a corner case where DSIM with TC9595 attached to it fails to operate the DP AUX channel, because the TC9595 enters some debug mode when it is released from reset without lanes in LP11 mode. By ensuring the DSIM lanes are in LP11, the TC9595 (tc358767.c driver) can be reset in its attach callback called from DSIM attach callback, and recovered out of the debug mode just before TC9595 performs first AUX channel access later in its attach callback. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Adam Ford <aford173@gmail.com> Cc: Alexander Stein <alexander.stein@ew.tq-group.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@gmail.com> Cc: Frieder Schrempf <frieder.schrempf@kontron.de> Cc: Inki Dae <inki.dae@samsung.com> Cc: Jagan Teki <jagan@amarulasolutions.com> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Michael Walle <mwalle@kernel.org> Cc: Neil Armstrong <neil.armstrong@linaro.org> Cc: Robert Foss <rfoss@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: dri-devel@lists.freedesktop.org Cc: kernel@dh-electronics.com --- drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)