From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD28CC04AAF for ; Mon, 20 May 2019 07:18:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DB922081C for ; Mon, 20 May 2019 07:18:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730520AbfETHSm (ORCPT ); Mon, 20 May 2019 03:18:42 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:47882 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730045AbfETHSm (ORCPT ); Mon, 20 May 2019 03:18:42 -0400 X-UUID: 3add5f435c494bd8a406e1c906e6e739-20190520 X-UUID: 3add5f435c494bd8a406e1c906e6e739-20190520 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1245372766; Mon, 20 May 2019 15:18:25 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS33DR.mediatek.inc (172.27.6.106) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 20 May 2019 15:18:23 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 20 May 2019 15:18:23 +0800 Message-ID: <1558336703.7311.37.camel@mtksdaap41> Subject: Re: [v3 1/7] drm/mediatek: move mipi_dsi_host_register to probe From: CK Hu To: Jitao Shi CC: Rob Herring , Pawel Moll , "Mark Rutland" , Ian Campbell , Kumar Gala , , David Airlie , "Matthias Brugger" , Thierry Reding , "Ajay Kumar" , Inki Dae , "Rahul Sharma" , Sean Paul , Vincent Palatin , Andy Yan , Philipp Zabel , "Russell King" , , , , , , , Sascha Hauer , , , , , Date: Mon, 20 May 2019 15:18:23 +0800 In-Reply-To: <20190519092537.69053-2-jitao.shi@mediatek.com> References: <20190519092537.69053-1-jitao.shi@mediatek.com> <20190519092537.69053-2-jitao.shi@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Jitao: On Sun, 2019-05-19 at 17:25 +0800, Jitao Shi wrote: > DSI panel driver need attach function which is inculde in > mipi_dsi_host_ops. > > If mipi_dsi_host_register is not in probe, dsi panel will > probe fail or more delay. In [1], you have agreed this patch just for delay not for probe fail Remove 'probe fail'.in commit message. [1] http://lists.infradead.org/pipermail/linux-mediatek/2019-May/019836.html > > So move the mipi_dsi_host_register to probe from bind. > > Signed-off-by: Jitao Shi > --- > drivers/gpu/drm/mediatek/mtk_dsi.c | 50 ++++++++++++++++++------------ > 1 file changed, 30 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index b00eb2d2e086..6c4ac37f983d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -1045,12 +1045,6 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) > return ret; > } > > - ret = mipi_dsi_host_register(&dsi->host); > - if (ret < 0) { > - dev_err(dev, "failed to register DSI host: %d\n", ret); > - goto err_ddp_comp_unregister; > - } > - > ret = mtk_dsi_create_conn_enc(drm, dsi); > if (ret) { > DRM_ERROR("Encoder create failed with %d\n", ret); > @@ -1060,8 +1054,6 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) > return 0; > > err_unregister: > - mipi_dsi_host_unregister(&dsi->host); > -err_ddp_comp_unregister: > mtk_ddp_comp_unregister(drm, &dsi->ddp_comp); > return ret; > } > @@ -1097,31 +1089,37 @@ static int mtk_dsi_probe(struct platform_device *pdev) > > dsi->host.ops = &mtk_dsi_ops; > dsi->host.dev = dev; > + dsi->dev = dev; This is for debug message, not for the timing of mipi_dsi_host_register(), so move to an independent patch. Regards, CK > + ret = mipi_dsi_host_register(&dsi->host); > + if (ret < 0) { > + dev_err(dev, "failed to register DSI host: %d\n", ret); > + return ret; > + } > > ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, > &dsi->panel, &dsi->bridge); > if (ret) > - return ret; > + goto err_unregister_host; > > 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); > - return ret; > + goto err_unregister_host; > } > > 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); > - return ret; > + goto err_unregister_host; > } > > dsi->hs_clk = devm_clk_get(dev, "hs"); > if (IS_ERR(dsi->hs_clk)) { > ret = PTR_ERR(dsi->hs_clk); > dev_err(dev, "Failed to get hs clock: %d\n", ret); > - return ret; > + goto err_unregister_host; > } > > regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); > @@ -1129,33 +1127,35 @@ static int mtk_dsi_probe(struct platform_device *pdev) > if (IS_ERR(dsi->regs)) { > ret = PTR_ERR(dsi->regs); > dev_err(dev, "Failed to ioremap memory: %d\n", ret); > - return ret; > + goto err_unregister_host; > } > > dsi->phy = devm_phy_get(dev, "dphy"); > if (IS_ERR(dsi->phy)) { > ret = PTR_ERR(dsi->phy); > dev_err(dev, "Failed to get MIPI-DPHY: %d\n", ret); > - return ret; > + goto err_unregister_host; > } > > comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DSI); > if (comp_id < 0) { > dev_err(dev, "Failed to identify by alias: %d\n", comp_id); > - return comp_id; > + ret = comp_id; > + goto err_unregister_host; > } > > ret = mtk_ddp_comp_init(dev, dev->of_node, &dsi->ddp_comp, comp_id, > &mtk_dsi_funcs); > if (ret) { > dev_err(dev, "Failed to initialize component: %d\n", ret); > - return ret; > + goto err_unregister_host; > } > > irq_num = platform_get_irq(pdev, 0); > if (irq_num < 0) { > - dev_err(&pdev->dev, "failed to request dsi irq resource\n"); > - return -EPROBE_DEFER; > + dev_err(&pdev->dev, "failed to get dsi irq_num: %d\n", irq_num); > + ret = irq_num; > + goto err_unregister_host; > } > > irq_set_status_flags(irq_num, IRQ_TYPE_LEVEL_LOW); > @@ -1163,14 +1163,24 @@ static int mtk_dsi_probe(struct platform_device *pdev) > IRQF_TRIGGER_LOW, dev_name(&pdev->dev), dsi); > if (ret) { > dev_err(&pdev->dev, "failed to request mediatek dsi irq\n"); > - return -EPROBE_DEFER; > + goto err_unregister_host; > } > > init_waitqueue_head(&dsi->irq_wait_queue); > > platform_set_drvdata(pdev, dsi); > > - return component_add(&pdev->dev, &mtk_dsi_component_ops); > + ret = component_add(&pdev->dev, &mtk_dsi_component_ops); > + if (ret) { > + dev_err(&pdev->dev, "failed to add component: %d\n", ret); > + goto err_unregister_host; > + } > + > + return 0; > + > +err_unregister_host: > + mipi_dsi_host_unregister(&dsi->host); > + return ret; > } > > static int mtk_dsi_remove(struct platform_device *pdev)