Hi,
On 25.10.2021 17:15, Maxime Ripard wrote:
> In order to avoid any probe ordering issue, the best practice is to move
> the secondary MIPI-DSI device registration and attachment to the
> MIPI-DSI host at probe time. Let's do this.
>
> Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Tested-by: John Stultz <john.stultz@xxxxxxxxxx>
> Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
This patch landed in linux-next as commit 864c49a31d6b ("drm/bridge:
adv7511: Register and attach our DSI device at probe"). Sadly it causes
endless probe-fail-defer loop on DragonBoard 410c board
(arch/arm64/boot/dts/qcom/apq8016-sbc.dts):
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: PMIC
REV: 1 CODEC Version: 1
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget ADC1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget ADC1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX3 overwritten
debugfs: File 'Capture' in directory 'dapm' already present!
adv7511 3-0039: failed to find dsi host
adv7511 3-0039: supply dvdd not found, using dummy regulator
adv7511 3-0039: supply pvdd not found, using dummy regulator
adv7511 3-0039: supply a2vdd not found, using dummy regulator
debugfs: Directory '7708000.audio-controller' with parent 'DB410c'
already present!
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: PMIC
REV: 1 CODEC Version: 1
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget ADC1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget ADC1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX3 overwritten
debugfs: File 'Capture' in directory 'dapm' already present!
adv7511 3-0039: failed to find dsi host
adv7511 3-0039: supply dvdd not found, using dummy regulator
adv7511 3-0039: supply pvdd not found, using dummy regulator
adv7511 3-0039: supply a2vdd not found, using dummy regulator
debugfs: Directory '7708000.audio-controller' with parent 'DB410c'
already present!
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: PMIC
REV: 1 CODEC Version: 1
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget ADC1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget ADC1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
sink widget PDM_RX1 overwritten
qcom,pm8916-wcd-spmi-codec 200f000.spmi:pmic@1:audio-codec@f000: ASoC:
source widget PDM_RX3 overwritten
debugfs: File 'Capture' in directory 'dapm' already present!
adv7511 3-0039: failed to find dsi host
adv7511 3-0039: supply dvdd not found, using dummy regulator
adv7511 3-0039: supply pvdd not found, using dummy regulator
adv7511 3-0039: supply a2vdd not found, using dummy regulator
debugfs: Directory '7708000.audio-controller' with parent 'DB410c'
already present!
...
Reverting it on top of linux next-20211028 'fixes' this issue.
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 9e3585f23cf1..f8e5da148599 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -910,9 +910,6 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge,
> return ret;
> }
>
> - if (adv->type == ADV7533 || adv->type == ADV7535)
> - ret = adv7533_attach_dsi(adv);
> -
> if (adv->i2c_main->irq)
> regmap_write(adv->regmap, ADV7511_REG_INT_ENABLE(0),
> ADV7511_INT0_HPD);
> @@ -1288,8 +1285,18 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
> drm_bridge_add(&adv7511->bridge);
>
> adv7511_audio_init(dev, adv7511);
> +
> + if (adv7511->type == ADV7533 || adv7511->type == ADV7535) {
> + ret = adv7533_attach_dsi(adv7511);
> + if (ret)
> + goto err_unregister_audio;
> + }
> +
> return 0;
>
> +err_unregister_audio:
> + adv7511_audio_exit(adv7511);
> + drm_bridge_remove(&adv7511->bridge);
> err_unregister_cec:
> i2c_unregister_device(adv7511->i2c_cec);
> clk_disable_unprepare(adv7511->cec_clk);
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
