From: Maxime Ripard <maxime.ripard@free-electrons.com> To: Rob Herring <robh+dt@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Mike Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, Maxime Ripard <maxime.ripard@free-electrons.com> Subject: [PATCH 09/20] drm/sun4i: defer only if we didn't find our panel Date: Mon, 16 May 2016 14:47:09 +0200 [thread overview] Message-ID: <1463402840-17062-10-git-send-email-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <1463402840-17062-1-git-send-email-maxime.ripard@free-electrons.com> Our code currently defers our probe on any error, even if we were not expecting to have one at all. Make sure we return -EPROBE_DEFER only when we were supposed to have a panel, but it's not probed yet. Fixes: 29e57fab97fc ("drm: sun4i: Add RGB output") Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/sun4i_tcon.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index 9f19b0e08560..eed6a9e8d9a6 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -429,7 +429,7 @@ static struct drm_panel *sun4i_tcon_find_panel(struct device_node *node) return ERR_PTR(-EINVAL); } - return of_drm_find_panel(remote); + return of_drm_find_panel(remote) ?: ERR_PTR(-EPROBE_DEFER); } static int sun4i_tcon_bind(struct device *dev, struct device *master, @@ -522,12 +522,13 @@ static int sun4i_tcon_probe(struct platform_device *pdev) * Defer the probe. */ panel = sun4i_tcon_find_panel(node); - if (IS_ERR(panel)) { - /* - * If we don't have a panel endpoint, just go on - */ - if (PTR_ERR(panel) != -ENODEV) - return -EPROBE_DEFER; + + /* + * If we don't have a panel endpoint, just go on + */ + if (PTR_ERR(panel) == -EPROBE_DEFER) { + DRM_DEBUG_DRIVER("Still waiting for our panel. Deferring...\n"); + return -EPROBE_DEFER; } return component_add(&pdev->dev, &sun4i_tcon_ops); -- 2.8.2
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/20] drm/sun4i: defer only if we didn't find our panel Date: Mon, 16 May 2016 14:47:09 +0200 [thread overview] Message-ID: <1463402840-17062-10-git-send-email-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <1463402840-17062-1-git-send-email-maxime.ripard@free-electrons.com> Our code currently defers our probe on any error, even if we were not expecting to have one at all. Make sure we return -EPROBE_DEFER only when we were supposed to have a panel, but it's not probed yet. Fixes: 29e57fab97fc ("drm: sun4i: Add RGB output") Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/sun4i_tcon.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index 9f19b0e08560..eed6a9e8d9a6 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -429,7 +429,7 @@ static struct drm_panel *sun4i_tcon_find_panel(struct device_node *node) return ERR_PTR(-EINVAL); } - return of_drm_find_panel(remote); + return of_drm_find_panel(remote) ?: ERR_PTR(-EPROBE_DEFER); } static int sun4i_tcon_bind(struct device *dev, struct device *master, @@ -522,12 +522,13 @@ static int sun4i_tcon_probe(struct platform_device *pdev) * Defer the probe. */ panel = sun4i_tcon_find_panel(node); - if (IS_ERR(panel)) { - /* - * If we don't have a panel endpoint, just go on - */ - if (PTR_ERR(panel) != -ENODEV) - return -EPROBE_DEFER; + + /* + * If we don't have a panel endpoint, just go on + */ + if (PTR_ERR(panel) == -EPROBE_DEFER) { + DRM_DEBUG_DRIVER("Still waiting for our panel. Deferring...\n"); + return -EPROBE_DEFER; } return component_add(&pdev->dev, &sun4i_tcon_ops); -- 2.8.2
next prev parent reply other threads:[~2016-05-16 12:47 UTC|newest] Thread overview: 117+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-16 12:47 [PATCH 00/20] drm: Add Support for Passive RGB to VGA bridges Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 01/20] clk: fixed-factor: Pass clk rates change to the parent Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-06-10 12:30 ` Maxime Ripard 2016-06-10 12:30 ` Maxime Ripard [not found] ` <1463402840-17062-2-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2016-06-17 23:05 ` Michael Turquette 2016-06-17 23:05 ` Michael Turquette 2016-06-17 23:05 ` Michael Turquette 2016-06-20 8:54 ` Maxime Ripard 2016-06-20 8:54 ` Maxime Ripard 2016-06-20 8:54 ` Maxime Ripard 2016-06-20 19:57 ` Michael Turquette 2016-06-20 19:57 ` Michael Turquette 2016-06-20 19:57 ` Michael Turquette 2016-05-16 12:47 ` [PATCH 03/20] clk: sunxi: tcon-ch1: Do not return a negative error in get_parent Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 16:05 ` Chen-Yu Tsai 2016-05-16 16:05 ` Chen-Yu Tsai 2016-06-10 9:50 ` Maxime Ripard 2016-06-10 9:50 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 04/20] clk: sunxi: display: Add per-clock flags Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 15:21 ` Chen-Yu Tsai 2016-05-16 15:21 ` Chen-Yu Tsai 2016-06-10 9:50 ` Maxime Ripard 2016-06-10 9:50 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 05/20] drm/sun4i: request exact rates to our parents Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 06/20] drm/sun4i: allow dclk to modify its parent rate Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 17:18 ` Chen-Yu Tsai 2016-05-16 17:18 ` Chen-Yu Tsai 2016-05-25 12:01 ` Maxime Ripard 2016-05-25 12:01 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 07/20] drm/sun4i: rgb: Validate the clock rate Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 08/20] drm/sun4i: rgb: panel is an error pointer Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-17 3:51 ` Chen-Yu Tsai 2016-05-17 3:51 ` Chen-Yu Tsai 2016-05-25 12:06 ` Maxime Ripard 2016-05-25 12:06 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard [this message] 2016-05-16 12:47 ` [PATCH 09/20] drm/sun4i: defer only if we didn't find our panel Maxime Ripard [not found] ` <1463402840-17062-10-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2016-05-17 3:52 ` Chen-Yu Tsai 2016-05-17 3:52 ` Chen-Yu Tsai 2016-05-17 3:52 ` Chen-Yu Tsai 2016-05-25 12:09 ` Maxime Ripard 2016-05-25 12:09 ` Maxime Ripard 2016-05-25 12:09 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 10/20] drm/sun4i: remove simplefb at probe Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 11/20] drm/sun4i: Convert to connector register helpers Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 12/20] drm/sun4i: Add bridge support Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 13:12 ` Daniel Vetter 2016-05-16 13:12 ` Daniel Vetter 2016-05-25 16:29 ` Maxime Ripard 2016-05-25 16:29 ` Maxime Ripard 2016-05-25 16:29 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 13/20] drm/bridge: Add RGB to VGA " Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 13:24 ` Laurent Pinchart 2016-05-16 13:24 ` Laurent Pinchart 2016-05-16 13:24 ` Laurent Pinchart 2016-05-26 8:53 ` Maxime Ripard 2016-05-26 8:53 ` Maxime Ripard 2016-05-26 9:16 ` Russell King - ARM Linux 2016-05-26 9:16 ` Russell King - ARM Linux 2016-05-16 14:07 ` Rob Herring 2016-05-16 14:07 ` Rob Herring 2016-05-16 14:07 ` Rob Herring 2016-05-26 9:38 ` Maxime Ripard 2016-05-26 9:38 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 14/20] ARM: sun5i: a13: Add LCD pins Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 17:13 ` Chen-Yu Tsai 2016-05-16 17:13 ` Chen-Yu Tsai 2016-05-25 12:33 ` Maxime Ripard 2016-05-25 12:33 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 16/20] ARM: sun5i: a13-olinuxino: Enable VGA bridge Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 17/20] ARM: multi_v7: Enable sun4i DRM driver Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-17 3:36 ` Chen-Yu Tsai 2016-05-17 3:36 ` Chen-Yu Tsai 2016-05-16 12:47 ` [PATCH 18/20] ARM: multi_v7: enable VGA bridge Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard [not found] ` <1463402840-17062-1-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2016-05-16 12:47 ` [PATCH 02/20] clk: multiplier: Prevent the multiplier from under / over flowing Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-06-10 12:31 ` Maxime Ripard 2016-06-10 12:31 ` Maxime Ripard 2016-06-20 20:50 ` Michael Turquette 2016-06-20 20:50 ` Michael Turquette 2016-06-20 20:50 ` Michael Turquette 2016-06-21 9:20 ` Maxime Ripard 2016-06-21 9:20 ` Maxime Ripard 2016-06-21 9:20 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 15/20] ARM: sun5i: Move display blocks to A13 Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` [PATCH 19/20] ARM: sunxi: Enable sun4i DRM driver Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 15:01 ` Chen-Yu Tsai 2016-05-16 15:01 ` Chen-Yu Tsai 2016-05-16 12:47 ` [PATCH 20/20] ARM: sunxi: Enable VGA bridge Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard 2016-05-16 12:47 ` Maxime Ripard
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=1463402840-17062-10-git-send-email-maxime.ripard@free-electrons.com \ --to=maxime.ripard@free-electrons.com \ --cc=airlied@linux.ie \ --cc=boris.brezillon@free-electrons.com \ --cc=daniel.vetter@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=wens@csie.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.