From: Sean Paul <seanpaul@chromium.org>
To: Yakir Yang <ykk@rock-chips.com>
Cc: "Mark Yao" <yzq@rock-chips.com>,
"Inki Dae" <inki.dae@samsung.com>,
"Jingoo Han" <jingoohan1@gmail.com>,
"Heiko Stuebner" <heiko@sntech.de>,
"Krzysztof Kozlowski" <k.kozlowski@samsung.com>,
linux-samsung-soc <linux-samsung-soc@vger.kernel.org>,
linux-rockchip@lists.infradead.org,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Emil Velikov" <emil.l.velikov@gmail.com>,
"Douglas Anderson" <dianders@chromium.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Javier Martinez Canillas" <javier@osg.samsung.com>,
"Tomasz Figa" <tomasz.figa@chromium.com>,
"Stéphane Marchesin" <marcheu@chromium.org>,
"Thierry Reding" <treding@nvidia.com>,
"Dan Carpenter" <dan.carpenter@oracle.com>
Subject: Re: [PATCH v3 06/10] drm/rockchip: analogix_dp: make panel detect to an optional action
Date: Thu, 23 Jun 2016 10:10:09 -0400 [thread overview]
Message-ID: <CAOw6vbK=KK2h5om6RCzj2nyR+9keB9Gqh0SNKW-m8gTvee3UMg@mail.gmail.com> (raw)
In-Reply-To: <1465904784-978-1-git-send-email-ykk@rock-chips.com>
On Tue, Jun 14, 2016 at 7:46 AM, Yakir Yang <ykk@rock-chips.com> wrote:
> Some boards don't need to declare a panel device node, like the
> display interface is DP monitors, so it's necessary to make the
> panel detect to an optional action.
>
> Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> Acked-by: Mark Yao <mark.yao@rock-chips.com>
> ---
> Changes in v3:
> - Add the acked flag from Mark.
>
> Changes in v2: None
>
> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 48 ++++++++++++-------------
> 1 file changed, 22 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> index bcd9ecc..da2e844 100644
> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> @@ -332,38 +332,34 @@ static int rockchip_dp_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct device_node *panel_node, *port, *endpoint;
> + struct drm_panel *panel = NULL;
> struct rockchip_dp_device *dp;
> - struct drm_panel *panel;
>
> port = of_graph_get_port_by_id(dev->of_node, 1);
> - if (!port) {
> - dev_err(dev, "can't find output port\n");
> - return -EINVAL;
> - }
> -
> - endpoint = of_get_child_by_name(port, "endpoint");
> - of_node_put(port);
> - if (!endpoint) {
> - dev_err(dev, "no output endpoint found\n");
> - return -EINVAL;
> - }
> -
> - panel_node = of_graph_get_remote_port_parent(endpoint);
> - of_node_put(endpoint);
> - if (!panel_node) {
> - dev_err(dev, "no output node found\n");
> - return -EINVAL;
> - }
> -
> - panel = of_drm_find_panel(panel_node);
> - if (!panel) {
> - DRM_ERROR("failed to find panel\n");
> + if (port) {
> + endpoint = of_get_child_by_name(port, "endpoint");
> + of_node_put(port);
> + if (!endpoint) {
> + dev_err(dev, "no output endpoint found\n");
> + return -EINVAL;
> + }
> +
> + panel_node = of_graph_get_remote_port_parent(endpoint);
> + of_node_put(endpoint);
> + if (!panel_node) {
> + dev_err(dev, "no output node found\n");
> + return -EINVAL;
> + }
> +
> + panel = of_drm_find_panel(panel_node);
> + if (!panel) {
> + DRM_ERROR("failed to find panel\n");
> + of_node_put(panel_node);
> + return -EPROBE_DEFER;
> + }
> of_node_put(panel_node);
Minor nit: Move of_node_put(panel_node) directly below
of_drm_find_panel to avoid duplicating it in both error and normal
paths (like you've done above).
Sean
> - return -EPROBE_DEFER;
> }
>
> - of_node_put(panel_node);
> -
> dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
> if (!dp)
> return -ENOMEM;
> --
> 1.9.1
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-06-23 14:18 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-14 11:45 [PATCH v3 0/10] Yakir Yang
2016-06-14 11:46 ` [PATCH v3 01/10] drm/bridge: analogix_dp: rename RK3288_DP to ROCKCHIP_DP Yakir Yang
2016-06-23 13:20 ` Sean Paul
2016-06-14 11:46 ` [PATCH v3 02/10] drm/rockchip: analogix_dp: split the lcdc select setting into device data Yakir Yang
2016-06-23 14:32 ` Sean Paul
2016-06-23 16:16 ` Heiko Stuebner
2016-06-29 7:09 ` [PATCH v3 02/10] drm/rockchip: analogix_dp: split the lcdc select setting into device data[Involving remittance information, please pay attention to the safety of property] Yakir Yang
2016-06-14 11:46 ` [PATCH v3 03/10] drm/bridge: analogix_dp: correct the register bit define error in ANALOGIX_DP_PLL_REG_1 Yakir Yang
2016-06-23 14:33 ` Sean Paul
2016-06-29 7:11 ` Yakir Yang
2016-06-14 11:46 ` [PATCH v3 04/10] drm/bridge: analogix_dp: some rockchip chips need to flip REF_CLK bit setting Yakir Yang
2016-06-23 13:27 ` Sean Paul
2016-06-29 7:13 ` Yakir Yang
2016-06-14 11:46 ` [PATCH v3 05/10] drm/rockchip: analogix_dp: add rk3399 eDP support Yakir Yang
2016-06-14 15:24 ` Doug Anderson
2016-06-15 1:56 ` Yakir Yang
2016-06-23 13:48 ` Sean Paul
2016-06-29 6:58 ` Yakir Yang
2016-06-14 11:46 ` [PATCH v3 06/10] drm/rockchip: analogix_dp: make panel detect to an optional action Yakir Yang
2016-06-23 14:10 ` Sean Paul [this message]
2016-06-29 6:43 ` Yakir Yang
2016-06-14 11:46 ` [PATCH v3 07/10] drm/bridge: analogix_dp: passing the connector as an argument in .get_modes() Yakir Yang
2016-06-14 16:26 ` Daniel Vetter
2016-06-14 16:26 ` Daniel Vetter
2016-06-14 16:28 ` Daniel Vetter
2016-06-15 1:58 ` Yakir Yang
2016-06-23 14:11 ` Sean Paul
2016-06-14 11:46 ` [PATCH v3 08/10] drm/rockchip: analogix_dp: correct the connector display color format and bpc Yakir Yang
2016-06-23 14:19 ` Sean Paul
2016-06-29 6:41 ` Yakir Yang
2016-06-14 11:46 ` [PATCH v3 09/10] drm/rockchip: analogix_dp: update the comments about why need to hardcode VOP output mode Yakir Yang
2016-06-23 14:22 ` Sean Paul
2016-06-29 6:42 ` Yakir Yang
2016-06-14 11:46 ` [PATCH v3 10/10] drm/bridge: analogix_dp: fix no drm hpd event when panel plug in Yakir Yang
2016-06-22 2:31 ` [PATCH v3.1 1/2] drm/rockchip: analogix_dp: introduce the pclk for grf Yakir Yang
2016-06-23 1:46 ` [PATCH v4 " Yakir Yang
2016-06-23 1:47 ` [PATCH v4 2/2] dt-bindings: analogix_dp: rockchip: correct the wrong compatible name Yakir Yang
2016-06-23 5:17 ` Doug Anderson
2016-06-29 3:32 ` Yakir Yang
2016-06-23 1:58 ` [PATCH v4.1 1/2] drm/rockchip: analogix_dp: introduce the pclk for grf Yakir Yang
2016-06-23 5:16 ` Doug Anderson
2016-06-29 3:35 ` Yakir Yang
2016-06-22 2:31 ` [PATCH v3.1 2/2] dt-bindings: analogix_dp: rockchip: correct the wrong compatible name Yakir Yang
2016-06-23 14:24 ` [PATCH v3 10/10] drm/bridge: analogix_dp: fix no drm hpd event when panel plug in Sean Paul
2016-06-29 3:35 ` Yakir Yang
2016-06-21 13:46 ` [PATCH v3 0/10] Archit Taneja
2016-06-22 2:24 ` Yakir Yang
2016-06-22 3:23 ` Archit Taneja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOw6vbK=KK2h5om6RCzj2nyR+9keB9Gqh0SNKW-m8gTvee3UMg@mail.gmail.com' \
--to=seanpaul@chromium.org \
--cc=dan.carpenter@oracle.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=heiko@sntech.de \
--cc=inki.dae@samsung.com \
--cc=javier@osg.samsung.com \
--cc=jingoohan1@gmail.com \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=marcheu@chromium.org \
--cc=tomasz.figa@chromium.com \
--cc=treding@nvidia.com \
--cc=ykk@rock-chips.com \
--cc=yzq@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).