Skip to content

Commit af19d64

Browse files
committed
drm/mediatek: Omit warning on probe defers
It can happen that the mmsys clock drivers aren't probed before the platform driver gets invoked. The platform driver used to print a warning that the driver failed to get the clocks. Omit this error on the defered probe path. Signed-off-by: Matthias Brugger <[email protected]> Reviewed-by: CK Hu <[email protected]> Signed-off-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Matthias Brugger <[email protected]>
1 parent 8f3d9f3 commit af19d64

File tree

7 files changed

+32
-10
lines changed

7 files changed

+32
-10
lines changed

drivers/gpu/drm/mediatek/mtk_disp_color.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@ static int mtk_disp_color_probe(struct platform_device *pdev)
119119
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
120120
&mtk_disp_color_funcs);
121121
if (ret) {
122-
dev_err(dev, "Failed to initialize component: %d\n", ret);
122+
if (ret != -EPROBE_DEFER)
123+
dev_err(dev, "Failed to initialize component: %d\n",
124+
ret);
125+
123126
return ret;
124127
}
125128

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,10 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
386386
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
387387
&mtk_disp_ovl_funcs);
388388
if (ret) {
389-
dev_err(dev, "Failed to initialize component: %d\n", ret);
389+
if (ret != -EPROBE_DEFER)
390+
dev_err(dev, "Failed to initialize component: %d\n",
391+
ret);
392+
390393
return ret;
391394
}
392395

drivers/gpu/drm/mediatek/mtk_disp_rdma.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
294294
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
295295
&mtk_disp_rdma_funcs);
296296
if (ret) {
297-
dev_err(dev, "Failed to initialize component: %d\n", ret);
297+
if (ret != -EPROBE_DEFER)
298+
dev_err(dev, "Failed to initialize component: %d\n",
299+
ret);
300+
298301
return ret;
299302
}
300303

drivers/gpu/drm/mediatek/mtk_dpi.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -716,21 +716,27 @@ static int mtk_dpi_probe(struct platform_device *pdev)
716716
dpi->engine_clk = devm_clk_get(dev, "engine");
717717
if (IS_ERR(dpi->engine_clk)) {
718718
ret = PTR_ERR(dpi->engine_clk);
719-
dev_err(dev, "Failed to get engine clock: %d\n", ret);
719+
if (ret != -EPROBE_DEFER)
720+
dev_err(dev, "Failed to get engine clock: %d\n", ret);
721+
720722
return ret;
721723
}
722724

723725
dpi->pixel_clk = devm_clk_get(dev, "pixel");
724726
if (IS_ERR(dpi->pixel_clk)) {
725727
ret = PTR_ERR(dpi->pixel_clk);
726-
dev_err(dev, "Failed to get pixel clock: %d\n", ret);
728+
if (ret != -EPROBE_DEFER)
729+
dev_err(dev, "Failed to get pixel clock: %d\n", ret);
730+
727731
return ret;
728732
}
729733

730734
dpi->tvd_clk = devm_clk_get(dev, "pll");
731735
if (IS_ERR(dpi->tvd_clk)) {
732736
ret = PTR_ERR(dpi->tvd_clk);
733-
dev_err(dev, "Failed to get tvdpll clock: %d\n", ret);
737+
if (ret != -EPROBE_DEFER)
738+
dev_err(dev, "Failed to get tvdpll clock: %d\n", ret);
739+
734740
return ret;
735741
}
736742

drivers/gpu/drm/mediatek/mtk_drm_ddp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,8 @@ static int mtk_ddp_probe(struct platform_device *pdev)
628628
if (!ddp->data->no_clk) {
629629
ddp->clk = devm_clk_get(dev, NULL);
630630
if (IS_ERR(ddp->clk)) {
631-
dev_err(dev, "Failed to get clock\n");
631+
if (PTR_ERR(ddp->clk) != -EPROBE_DEFER)
632+
dev_err(dev, "Failed to get clock\n");
632633
return PTR_ERR(ddp->clk);
633634
}
634635
}

drivers/gpu/drm/mediatek/mtk_dsi.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,14 +1194,18 @@ static int mtk_dsi_probe(struct platform_device *pdev)
11941194
dsi->engine_clk = devm_clk_get(dev, "engine");
11951195
if (IS_ERR(dsi->engine_clk)) {
11961196
ret = PTR_ERR(dsi->engine_clk);
1197-
dev_err(dev, "Failed to get engine clock: %d\n", ret);
1197+
1198+
if (ret != -EPROBE_DEFER)
1199+
dev_err(dev, "Failed to get engine clock: %d\n", ret);
11981200
goto err_unregister_host;
11991201
}
12001202

12011203
dsi->digital_clk = devm_clk_get(dev, "digital");
12021204
if (IS_ERR(dsi->digital_clk)) {
12031205
ret = PTR_ERR(dsi->digital_clk);
1204-
dev_err(dev, "Failed to get digital clock: %d\n", ret);
1206+
1207+
if (ret != -EPROBE_DEFER)
1208+
dev_err(dev, "Failed to get digital clock: %d\n", ret);
12051209
goto err_unregister_host;
12061210
}
12071211

drivers/gpu/drm/mediatek/mtk_hdmi.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
14741474

14751475
ret = mtk_hdmi_get_all_clk(hdmi, np);
14761476
if (ret) {
1477-
dev_err(dev, "Failed to get clocks: %d\n", ret);
1477+
if (ret != -EPROBE_DEFER)
1478+
dev_err(dev, "Failed to get clocks: %d\n", ret);
1479+
14781480
return ret;
14791481
}
14801482

0 commit comments

Comments
 (0)