Re: [PATCH v5 05/12] drm: mediatek: Omit warning on probe defers

Matthias Brugger
2018-11-19T09:27:03Z

On 19/11/2018 06:38, CK Hu wrote:
> Hi, Matthias:
>
> On Fri, 2018-11-16 at 13:54 +0100, matthias.bgg@kernel.org wrote:
>> From: Matthias Brugger <mbrugger@suse.com>
>>
>> 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.
>
> This patch looks good to me, but you have not modified the sub driver in
> HDMI path. We could let HDMI path print the warning and someone send
> another patch later, or you modify for HDMI path in this patch.

Sure, I'll add this in v6. After inspecting the code, I think we will need to
also check for not initialized clocks in mtk_mdp_comp_init, as the driver for
now does not even check if the clocks are present. What do you think?

I'll address the coding style issue you metioned below as well.

Regards,
Matthias

>>
>> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
>> ---
>> drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 +++-
>> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 +++-
>> drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 +++-
>> drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 3 ++-
>> drivers/gpu/drm/mediatek/mtk_dsi.c | 6 ++++--
>> 5 files changed, 15 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c
>> index f609b62b8be6..1ea3178d4c18 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
>> @@ -126,7 +126,9 @@ 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);
>
> I would like one more blank line here.
>
>> return ret;
>> }
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
>> index 28d191192945..5ebbcaa4e70e 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
>> @@ -293,7 +293,9 @@ 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);
>
> I would like to align to the right of '('.
>
> Regards,
> CK
>
>> return ret;
>> }
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
>> index b0a5cffe345a..59a08ed5fea5 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
>> @@ -295,7 +295,9 @@ 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;
>> }
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
>> index b06cd9d4b525..b76a2d071a97 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
>> @@ -566,7 +566,8 @@ static int mtk_ddp_probe(struct platform_device *pdev)
>>
>> ddp->clk = devm_clk_get(dev, NULL);
>> if (IS_ERR(ddp->clk)) {
>> - dev_err(dev, "Failed to get clock\n");
>> + if (PTR_ERR(ddp->clk) != -EPROBE_DEFER)
>> + dev_err(dev, "Failed to get clock\n");
>> return PTR_ERR(ddp->clk);
>> }
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
>> index 90109a0d6fff..cc6de75636c3 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
>> @@ -1103,14 +1103,16 @@ static int mtk_dsi_probe(struct platform_device *pdev)
>> dsi->engine_clk = devm_clk_get(dev, "engine");
>> if (IS_ERR(dsi->engine_clk)) {
>> ret = PTR_ERR(dsi->engine_clk);
>> - dev_err(dev, "Failed to get engine clock: %d\n", ret);
>> + if (ret != -EPROBE_DEFER)
>> + dev_err(dev, "Failed to get engine clock: %d\n", ret);
>> return ret;
>> }
>>
>> dsi->digital_clk = devm_clk_get(dev, "digital");
>> if (IS_ERR(dsi->digital_clk)) {
>> ret = PTR_ERR(dsi->digital_clk);
>> - dev_err(dev, "Failed to get digital clock: %d\n", ret);
>> + if (ret != -EPROBE_DEFER)
>> + dev_err(dev, "Failed to get digital clock: %d\n", ret);
>> return ret;
>> }
>>
>
>