Commit af19d645 authored by Matthias Brugger's avatar Matthias Brugger Committed by Matthias Brugger
Browse files

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: default avatarMatthias Brugger <mbrugger@suse.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 8f3d9f35

drivers/gpu/drm/mediatek/mtk_disp_color.c

+4 −1
Original line number Diff line number Diff line
@@ -119,7 +119,10 @@ static int mtk_disp_color_probe(struct platform_device *pdev) 
	ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,

				&mtk_disp_color_funcs);

	if (ret) {

		dev_err(dev, "Failed to initialize component: %d\n", ret);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to initialize component: %d\n",

				ret);



		return ret;

	}

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

+4 −1
Original line number Diff line number Diff line
@@ -386,7 +386,10 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) 
	ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,

				&mtk_disp_ovl_funcs);

	if (ret) {

		dev_err(dev, "Failed to initialize component: %d\n", ret);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to initialize component: %d\n",

				ret);



		return ret;

	}

drivers/gpu/drm/mediatek/mtk_disp_rdma.c

+4 −1
Original line number Diff line number Diff line
@@ -294,7 +294,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) 
	ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,

				&mtk_disp_rdma_funcs);

	if (ret) {

		dev_err(dev, "Failed to initialize component: %d\n", ret);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to initialize component: %d\n",

				ret);



		return ret;

	}

drivers/gpu/drm/mediatek/mtk_dpi.c

+9 −3
Original line number Diff line number Diff line
@@ -716,21 +716,27 @@ static int mtk_dpi_probe(struct platform_device *pdev) 
	dpi->engine_clk = devm_clk_get(dev, "engine");

	if (IS_ERR(dpi->engine_clk)) {

		ret = PTR_ERR(dpi->engine_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get engine clock: %d\n", ret);



		return ret;

	}



	dpi->pixel_clk = devm_clk_get(dev, "pixel");

	if (IS_ERR(dpi->pixel_clk)) {

		ret = PTR_ERR(dpi->pixel_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get pixel clock: %d\n", ret);



		return ret;

	}



	dpi->tvd_clk = devm_clk_get(dev, "pll");

	if (IS_ERR(dpi->tvd_clk)) {

		ret = PTR_ERR(dpi->tvd_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to get tvdpll clock: %d\n", ret);



		return ret;

	}

drivers/gpu/drm/mediatek/mtk_drm_ddp.c

+2 −1
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ static int mtk_ddp_probe(struct platform_device *pdev) 
	if (!ddp->data->no_clk) {

		ddp->clk = devm_clk_get(dev, NULL);

		if (IS_ERR(ddp->clk)) {

			if (PTR_ERR(ddp->clk) != -EPROBE_DEFER)

				dev_err(dev, "Failed to get clock\n");

			return PTR_ERR(ddp->clk);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE