From patchwork Fri Dec 10 17:48:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1809 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A3D383F075 for ; Fri, 10 Dec 2021 18:49:16 +0100 (CET) Received: by mail-pf1-f200.google.com with SMTP id e7-20020aa798c7000000b004a254db7946sf6060312pfm.17 for ; Fri, 10 Dec 2021 09:49:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639158555; cv=pass; d=google.com; s=arc-20160816; b=cbJfLqGZ/T+MpX81aSDbM3vxWxbdDnyo2rlRUOdJHT6Si3RNfVWUN3Ooos5YEXpTAu 44CvdXigp1qiNljkDDNaD0C+gkNuKeLQ00utWrdJ06HOiVEkBlr3TTn4v/8FIU8AQUKS iubzW9pt077kOpvqSfoeWaw2K139shq1Rz29aub+nHOgY3rhRAAyVjc1gxlJWTPB6Wf0 yUAKiYWJ+FwWKj4eB/vOX15XlPIbZ7HvcAGUJM+feovHqshPvsIIHLZdOYQKqpQ+1kQy b8PPHEdn4WY9oQP2n1u2+guweQSzhTHNFZJ+hhRoyssWxScKbLIFW5+A69jLP+1Cd7Gq jzKw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3r1K84hPFgUDZRsxJ4zJyAJ0YQawq28FiKeJ/XI+jBo=; b=MYDC9lvxMu+UtnyvGHk9RQB5QlwgDqMjLuI1yor3WmbOQJ2xS9XlXstIlF/rRQX6ai d4+EEUp4VW4Y2hTQyZwW2ylpNseetDPvSALUD2U0HVp+kdGv+cIHa97LCMH6dFxkbNF5 F1bQjJiDRxw+V0UWpm8tZdJ4Y/LudblzjMNOOPqj6MWPJyp+dv28TLGxfjZ19taGOA8W c2DLXrS6++F8M4XmYjwxuX8J68HKriuiyxGRQCXC/zC7sU1pJ3pdS/++LoPu3O0onw4C +NGQl5ESXVDYehtwWrS+FKv7GXazMWmsICVYU82zVKlmXgmWK4Nlk5gWLKQpskCnQj2L VwbQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lQzcmxEq; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=3r1K84hPFgUDZRsxJ4zJyAJ0YQawq28FiKeJ/XI+jBo=; b=hEBkFCcCcucscmahE35SA9daBY//lwvb0XADtYQNf/ZjfFMbRUI6cvej/JG4iVsZtU K1Rwc74cwAnuBSFFE+dYOeOtB+YQ8IjCLAIUU32whshiYgIOSRtG5m2hbpp9py0H+B2B SVYZN5pPEcZB8O+VwTv6zOhPmwrVd0sYLlHCw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=3r1K84hPFgUDZRsxJ4zJyAJ0YQawq28FiKeJ/XI+jBo=; b=1JUlSp4qJgl8TvU2iluG5oWWyZujl4KY8q0CBJqTE51fbY6X5OsPZRoZfkxfANUDnw 3hemk5VYneeMf8QZrhLxYQBVic5U9jwmLszDOu4mJa4tgnguZpIsVwskTvqpMGdUex+i 7f+52fxUgVuSv/d/RWmOIp3PRBTGfD5pIP1lGgEV9HcLtqnpo+oN1aIBStOtuEpUPZ0F 4q7gz3u16ZVRT82yQ0BNWDlUJnDzlN50W6OvhelCgH4Q9XSW9hT70gNQ3gEETeqyjtG5 +xdlpe7MLL91JMBuiugnnu/X6jFdWRsAzgjUh3cXCEjVFd5372m4Entbl6tzRMkylcZJ gr4w== X-Gm-Message-State: AOAM53171wY88LbK6/FHujPM1phHCYqFEwtPjvGIJ2uu5IjhFOhHT9ra 7zFKOZPFjB4bBDaUbTCSUC3vBYo5 X-Google-Smtp-Source: ABdhPJwBBps0Ozii/Fz00oSYncwnmNaYWkHPx4cnF7lmmz/9VQcwlFY7mCj5n7Zq9BeX+t5pEE/aBg== X-Received: by 2002:a62:6dc2:0:b0:4af:98e:1d3b with SMTP id i185-20020a626dc2000000b004af098e1d3bmr19211009pfc.52.1639158555250; Fri, 10 Dec 2021 09:49:15 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6a00:15cb:: with SMTP id o11ls3597698pfu.9.gmail; Fri, 10 Dec 2021 09:49:14 -0800 (PST) X-Received: by 2002:a05:6a00:23c8:b0:49f:e054:84d7 with SMTP id g8-20020a056a0023c800b0049fe05484d7mr19426005pfc.50.1639158554465; Fri, 10 Dec 2021 09:49:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639158554; cv=none; d=google.com; s=arc-20160816; b=Jo99C1nQR/SdWEcuKd/3b4bcsWyT99gSybFfS18nojF4k8A6N4dLtZgAK/DbxuigEm hUDNTrX7FMYr8QVpNXPk8ccGPoFwUVW9yQRoD1wsXq0HO72+JsbxzLbb54M6F3uRo2Eh jGsZIe2qKqAqcbDMQn+YhejtX/nkJks1DtvHKKt1F75Vr41cUFwZJS7s0hGXSA21nyGn EMuG0QG/IVZy5dqggInt0wZea1I/2QdP72RFPiC4OE1HeAFpc2rXCjrMhhR/m27n3okU pBCLFz1DioZSMn2pXHmhQ6hwkfjLpwNx0LI4L5rctfFBxb/diuWAn4aTYRBOKxSaE/NT 3dTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=/0452zXAT4kPvtxYy8MYfb9PCgWUx3+xujH6gdkFnig=; b=BSQv02sHLrXcZpDkZXFmcK84O6LamRRGfKuP8tTcNBorVMmBu07SsADe+WI5t7igSe /+KPJmrZD9EI+fSXrnzIce7XM9GKrEbHTJnc8LCKd7wAf/Jg8yDJ2IFqljM9XoxXYhes ttse8bCd8WVm1+O8hC4rIfp7R+XR8L5BdS85t4Rp6TVzXXiQBYDaPaX40hITfYdWlYMB +8lgiJS3jjOCGeWWWJ4GLEYUfoauwA6hz+yLES1l6vQkNCV40OBn2dLsIGUvm5A7rT7n c20g5AE6RiF4I9zXtIpVqsnzTLdHU6/VvxiL41eyNakKAgnQh8k7vlipvC6xMutZUCXw 20zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lQzcmxEq; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id oc13sor3049913pjb.7.2021.12.10.09.49.14 for (Google Transport Security); Fri, 10 Dec 2021 09:49:14 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:90a:c506:: with SMTP id k6mr25968773pjt.74.1639158554132; Fri, 10 Dec 2021 09:49:14 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a0a9:28d6:2bae:633e:b110]) by smtp.gmail.com with ESMTPSA id w1sm4039644pfg.11.2021.12.10.09.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 09:49:13 -0800 (PST) From: Jagan Teki To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Yannick Fertre , Maxime Ripard , Sam Ravnborg , Michael Nazzareno Trimarchi Cc: dri-devel@lists.freedesktop.org, linux-stm32@st-md-mailman.stormreply.com, linux-amarula@amarulasolutions.com, Jagan Teki , Philipp Zabel , Chun-Kuang Hu , Linus Walleij Subject: [PATCH 3/3] drm: bridge: Switch to devm_drm_of_get_bridge Date: Fri, 10 Dec 2021 23:18:19 +0530 Message-Id: <20211210174819.2250178-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211210174819.2250178-1-jagan@amarulasolutions.com> References: <20211210174819.2250178-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lQzcmxEq; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , devm_drm_of_get_bridge is capable of looking up the downstream bridge and panel and trying to add a panel bridge if the panel is found. Replace explicit finding calls with devm_drm_of_get_bridge. Cc: Philipp Zabel Cc: Chun-Kuang Hu Cc: Linus Walleij Signed-off-by: Jagan Teki --- Note: for mcde_dsi child lookups has dependecy with https://patchwork.kernel.org/project/dri-devel/cover/20211207054747.461029-1-jagan@amarulasolutions.com/ drivers/gpu/drm/bridge/analogix/anx7625.c | 13 +------ drivers/gpu/drm/bridge/chipone-icn6211.c | 7 +--- drivers/gpu/drm/bridge/nwl-dsi.c | 18 ++------- drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +--- drivers/gpu/drm/bridge/parade-ps8622.c | 7 +--- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 15 ++----- drivers/gpu/drm/mcde/mcde_dsi.c | 39 +++---------------- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++----- 8 files changed, 18 insertions(+), 102 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 001fb39d9919..065cc3b041dd 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1333,8 +1333,6 @@ static int anx7625_parse_dt(struct device *dev, struct anx7625_platform_data *pdata) { struct device_node *np = dev->of_node, *ep0; - struct drm_panel *panel; - int ret; int bus_type, mipi_lanes; anx7625_get_swing_setting(dev, pdata); @@ -1371,16 +1369,7 @@ static int anx7625_parse_dt(struct device *dev, if (of_property_read_bool(np, "analogix,audio-enable")) pdata->audio_en = 1; - ret = drm_of_find_panel_or_bridge(np, 1, 0, &panel, NULL); - if (ret < 0) { - if (ret == -ENODEV) - return 0; - return ret; - } - if (!panel) - return -ENODEV; - - pdata->panel_bridge = devm_drm_panel_bridge_add(dev, panel); + pdata->panel_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0); if (IS_ERR(pdata->panel_bridge)) return PTR_ERR(pdata->panel_bridge); DRM_DEV_DEBUG_DRIVER(dev, "get panel node.\n"); diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c index a6151db95586..23c34039ac48 100644 --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -178,7 +178,6 @@ static const struct drm_bridge_funcs chipone_bridge_funcs = { static int chipone_parse_dt(struct chipone *icn) { struct device *dev = icn->dev; - struct drm_panel *panel; int ret; icn->vdd1 = devm_regulator_get_optional(dev, "vdd1"); @@ -214,11 +213,7 @@ static int chipone_parse_dt(struct chipone *icn) return PTR_ERR(icn->enable_gpio); } - ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL); - if (ret) - return ret; - - icn->panel_bridge = devm_drm_panel_bridge_add(dev, panel); + icn->panel_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0); if (IS_ERR(icn->panel_bridge)) return PTR_ERR(icn->panel_bridge); diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c index 6becdcdc99fe..f6859dfa6d36 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -910,22 +910,10 @@ static int nwl_dsi_bridge_attach(struct drm_bridge *bridge, { struct nwl_dsi *dsi = bridge_to_dsi(bridge); struct drm_bridge *panel_bridge; - struct drm_panel *panel; - int ret; - - ret = drm_of_find_panel_or_bridge(dsi->dev->of_node, 1, 0, &panel, - &panel_bridge); - if (ret) - return ret; - - if (panel) { - panel_bridge = drm_panel_bridge_add(panel); - if (IS_ERR(panel_bridge)) - return PTR_ERR(panel_bridge); - } - if (!panel_bridge) - return -EPROBE_DEFER; + panel_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 1, 0); + if (IS_ERR(panel_bridge)) + return PTR_ERR(panel_bridge); return drm_bridge_attach(bridge->encoder, panel_bridge, bridge, flags); } diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index e941c1132598..1ab91f4e057b 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -263,7 +263,6 @@ static int ptn3460_probe(struct i2c_client *client, struct device *dev = &client->dev; struct ptn3460_bridge *ptn_bridge; struct drm_bridge *panel_bridge; - struct drm_panel *panel; int ret; ptn_bridge = devm_kzalloc(dev, sizeof(*ptn_bridge), GFP_KERNEL); @@ -271,11 +270,7 @@ static int ptn3460_probe(struct i2c_client *client, return -ENOMEM; } - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, NULL); - if (ret) - return ret; - - panel_bridge = devm_drm_panel_bridge_add(dev, panel); + panel_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); if (IS_ERR(panel_bridge)) return PTR_ERR(panel_bridge); diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 614b19f0f1b7..37b308850b4e 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -452,18 +452,13 @@ static int ps8622_probe(struct i2c_client *client, struct device *dev = &client->dev; struct ps8622_bridge *ps8622; struct drm_bridge *panel_bridge; - struct drm_panel *panel; int ret; ps8622 = devm_kzalloc(dev, sizeof(*ps8622), GFP_KERNEL); if (!ps8622) return -ENOMEM; - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, NULL); - if (ret) - return ret; - - panel_bridge = devm_drm_panel_bridge_add(dev, panel); + panel_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); if (IS_ERR(panel_bridge)) return PTR_ERR(panel_bridge); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c index 7900da1d4325..eafd1e5e6852 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -315,7 +315,6 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, struct dw_mipi_dsi *dsi = host_to_dsi(host); const struct dw_mipi_dsi_plat_data *pdata = dsi->plat_data; struct drm_bridge *bridge; - struct drm_panel *panel; int ret; if (device->lanes > dsi->plat_data->max_data_lanes) { @@ -329,17 +328,9 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, dsi->format = device->format; dsi->mode_flags = device->mode_flags; - ret = drm_of_find_panel_or_bridge(host->dev->of_node, 1, 0, - &panel, &bridge); - if (ret) - return ret; - - if (panel) { - bridge = drm_panel_bridge_add_typed(panel, - DRM_MODE_CONNECTOR_DSI); - if (IS_ERR(bridge)) - return PTR_ERR(bridge); - } + bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, 1, 0); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); dsi->panel_bridge = bridge; diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 5651734ce977..9371349b8b25 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -1073,9 +1073,7 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, struct drm_device *drm = data; struct mcde *mcde = to_mcde(drm); struct mcde_dsi *d = dev_get_drvdata(dev); - struct device_node *child; - struct drm_panel *panel = NULL; - struct drm_bridge *bridge = NULL; + struct drm_bridge *bridge; if (!of_get_available_child_count(dev->of_node)) { dev_info(dev, "unused DSI interface\n"); @@ -1100,37 +1098,10 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, return PTR_ERR(d->lp_clk); } - /* Look for a panel as a child to this node */ - for_each_available_child_of_node(dev->of_node, child) { - panel = of_drm_find_panel(child); - if (IS_ERR(panel)) { - dev_err(dev, "failed to find panel try bridge (%ld)\n", - PTR_ERR(panel)); - panel = NULL; - - bridge = of_drm_find_bridge(child); - if (!bridge) { - dev_err(dev, "failed to find bridge\n"); - return -EINVAL; - } - } - } - if (panel) { - bridge = drm_panel_bridge_add_typed(panel, - DRM_MODE_CONNECTOR_DSI); - if (IS_ERR(bridge)) { - dev_err(dev, "error adding panel bridge\n"); - return PTR_ERR(bridge); - } - dev_info(dev, "connected to panel\n"); - d->panel = panel; - } else if (bridge) { - /* TODO: AV8100 HDMI encoder goes here for example */ - dev_info(dev, "connected to non-panel bridge (unsupported)\n"); - return -ENODEV; - } else { - dev_err(dev, "no panel or bridge\n"); - return -ENODEV; + bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); + if (IS_ERR(bridge)) { + dev_err(dev, "error to get bridge\n"); + return PTR_ERR(bridge); } d->bridge_out = bridge; diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 5d90d2eb0019..a1b3e1f4b497 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -1004,7 +1004,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) { struct mtk_dsi *dsi; struct device *dev = &pdev->dev; - struct drm_panel *panel; struct resource *regs; int irq_num; int ret; @@ -1021,17 +1020,10 @@ static int mtk_dsi_probe(struct platform_device *pdev) return ret; } - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, - &panel, &dsi->next_bridge); - if (ret) + dsi->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); + if (IS_ERR(dsi->next_bridge)) { + ret = PTR_ERR(dsi->next_bridge); goto err_unregister_host; - - if (panel) { - dsi->next_bridge = devm_drm_panel_bridge_add(dev, panel); - if (IS_ERR(dsi->next_bridge)) { - ret = PTR_ERR(dsi->next_bridge); - goto err_unregister_host; - } } dsi->driver_data = of_device_get_match_data(dev);