From: John Keeping <john@metanate.com>
To: Sean Paul <seanpaul@chromium.org>
Cc: Mark Yao <mark.yao@rock-chips.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org,
Chris Zhong <zyw@rock-chips.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded
Date: Fri, 10 Feb 2017 17:27:47 +0000 [thread overview]
Message-ID: <20170210172747.5f0afb0a.john@metanate.com> (raw)
In-Reply-To: <20170131192117.GE20076@art_vandelay>
On Tue, 31 Jan 2017 14:21:17 -0500, Sean Paul wrote:
> On Sun, Jan 29, 2017 at 01:24:41PM +0000, John Keeping wrote:
> > This ensures that the output resolution is known before fbcon loads.
> >
> > Signed-off-by: John Keeping <john@metanate.com>
> > ---
> > Unchanged in v3
> > Unchanged in v2
> >
> > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > index f5b15377ef85..5bad92e2370e 100644
> > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
> >
> > dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
> > dsi->dsi_host.dev = dev;
> > - return mipi_dsi_host_register(&dsi->dsi_host);
> > + ret = mipi_dsi_host_register(&dsi->dsi_host);
> > + if (!ret && !dsi->panel) {
> > + mipi_dsi_host_unregister(&dsi->dsi_host);
> > + drm_encoder_cleanup(&dsi->encoder);
> > + drm_connector_cleanup(&dsi->connector);
>
> Move the host registration up before dw_mipi_dsi_register() to avoid
> having to clean up the encoder and connector?
No, mipi_dsi_host_register() has to be called after the connector is
registered because it is likely to result in a call to
dw_mipi_dsi_host_attach() which attaches a panel to the connector.
> > + ret = -EPROBE_DEFER;
> > + }
> >
> > err_pllref:
> > - clk_disable_unprepare(dsi->pllref_clk);
> > + if (ret)
>
> I personally think it's cleaner to explicitly goto in the error conditional (or
> in this case, the defer conditional) and have a return 0; right before the err_*
> labels. Then you don't need to worry about a) checking ret in all of your
> cleanups and b) someone adding code above the labels that you don't intend to
> run.
Agreed. I'll change this to use a goto if we hit the EPROBE_DEFER case
and keep all the cleanup together.
> > + clk_disable_unprepare(dsi->pllref_clk);
> > return ret;
> > }
WARNING: multiple messages have this Message-ID (diff)
From: John Keeping <john@metanate.com>
To: Sean Paul <seanpaul@chromium.org>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org,
Chris Zhong <zyw@rock-chips.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded
Date: Fri, 10 Feb 2017 17:27:47 +0000 [thread overview]
Message-ID: <20170210172747.5f0afb0a.john@metanate.com> (raw)
In-Reply-To: <20170131192117.GE20076@art_vandelay>
On Tue, 31 Jan 2017 14:21:17 -0500, Sean Paul wrote:
> On Sun, Jan 29, 2017 at 01:24:41PM +0000, John Keeping wrote:
> > This ensures that the output resolution is known before fbcon loads.
> >
> > Signed-off-by: John Keeping <john@metanate.com>
> > ---
> > Unchanged in v3
> > Unchanged in v2
> >
> > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > index f5b15377ef85..5bad92e2370e 100644
> > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
> >
> > dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
> > dsi->dsi_host.dev = dev;
> > - return mipi_dsi_host_register(&dsi->dsi_host);
> > + ret = mipi_dsi_host_register(&dsi->dsi_host);
> > + if (!ret && !dsi->panel) {
> > + mipi_dsi_host_unregister(&dsi->dsi_host);
> > + drm_encoder_cleanup(&dsi->encoder);
> > + drm_connector_cleanup(&dsi->connector);
>
> Move the host registration up before dw_mipi_dsi_register() to avoid
> having to clean up the encoder and connector?
No, mipi_dsi_host_register() has to be called after the connector is
registered because it is likely to result in a call to
dw_mipi_dsi_host_attach() which attaches a panel to the connector.
> > + ret = -EPROBE_DEFER;
> > + }
> >
> > err_pllref:
> > - clk_disable_unprepare(dsi->pllref_clk);
> > + if (ret)
>
> I personally think it's cleaner to explicitly goto in the error conditional (or
> in this case, the defer conditional) and have a return 0; right before the err_*
> labels. Then you don't need to worry about a) checking ret in all of your
> cleanups and b) someone adding code above the labels that you don't intend to
> run.
Agreed. I'll change this to use a goto if we hit the EPROBE_DEFER case
and keep all the cleanup together.
> > + clk_disable_unprepare(dsi->pllref_clk);
> > return ret;
> > }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: john@metanate.com (John Keeping)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded
Date: Fri, 10 Feb 2017 17:27:47 +0000 [thread overview]
Message-ID: <20170210172747.5f0afb0a.john@metanate.com> (raw)
In-Reply-To: <20170131192117.GE20076@art_vandelay>
On Tue, 31 Jan 2017 14:21:17 -0500, Sean Paul wrote:
> On Sun, Jan 29, 2017 at 01:24:41PM +0000, John Keeping wrote:
> > This ensures that the output resolution is known before fbcon loads.
> >
> > Signed-off-by: John Keeping <john@metanate.com>
> > ---
> > Unchanged in v3
> > Unchanged in v2
> >
> > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > index f5b15377ef85..5bad92e2370e 100644
> > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> > @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
> >
> > dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
> > dsi->dsi_host.dev = dev;
> > - return mipi_dsi_host_register(&dsi->dsi_host);
> > + ret = mipi_dsi_host_register(&dsi->dsi_host);
> > + if (!ret && !dsi->panel) {
> > + mipi_dsi_host_unregister(&dsi->dsi_host);
> > + drm_encoder_cleanup(&dsi->encoder);
> > + drm_connector_cleanup(&dsi->connector);
>
> Move the host registration up before dw_mipi_dsi_register() to avoid
> having to clean up the encoder and connector?
No, mipi_dsi_host_register() has to be called after the connector is
registered because it is likely to result in a call to
dw_mipi_dsi_host_attach() which attaches a panel to the connector.
> > + ret = -EPROBE_DEFER;
> > + }
> >
> > err_pllref:
> > - clk_disable_unprepare(dsi->pllref_clk);
> > + if (ret)
>
> I personally think it's cleaner to explicitly goto in the error conditional (or
> in this case, the defer conditional) and have a return 0; right before the err_*
> labels. Then you don't need to worry about a) checking ret in all of your
> cleanups and b) someone adding code above the labels that you don't intend to
> run.
Agreed. I'll change this to use a goto if we hit the EPROBE_DEFER case
and keep all the cleanup together.
> > + clk_disable_unprepare(dsi->pllref_clk);
> > return ret;
> > }
next prev parent reply other threads:[~2017-02-10 18:27 UTC|newest]
Thread overview: 209+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-29 13:24 [PATCH v3 00/24] drm/rockchip: MIPI fixes & improvements John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 01/24] drm/rockchip: dw-mipi-dsi: don't configure hardware in mode_set for MIPI John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 15:35 ` Sean Paul
2017-01-30 15:35 ` Sean Paul
2017-01-30 15:35 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 02/24] drm/rockchip: dw-mipi-dsi: pass mode in where needed John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 15:40 ` Sean Paul
2017-01-30 15:40 ` Sean Paul
2017-01-30 15:40 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 03/24] drm/rockchip: dw-mipi-dsi: remove mode_set hook John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 15:40 ` Sean Paul
2017-01-30 15:40 ` Sean Paul
2017-01-30 15:40 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 04/24] drm/rockchip: dw-mipi-dsi: fix command header writes John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 15:43 ` Sean Paul
2017-01-30 15:43 ` Sean Paul
2017-01-30 15:43 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 05/24] drm/rockchip: dw-mipi-dsi: fix generic packet status check John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 17:56 ` Sean Paul
2017-01-30 17:56 ` Sean Paul
2017-01-30 17:56 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 06/24] drm/rockchip: dw-mipi-dsi: avoid out-of-bounds read on tx_buf John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 18:01 ` Sean Paul
2017-01-30 18:01 ` Sean Paul
2017-01-30 18:01 ` Sean Paul
2017-01-30 18:16 ` John Keeping
2017-01-30 18:16 ` John Keeping
2017-01-30 18:16 ` John Keeping
2017-01-30 20:09 ` Sean Paul
2017-01-30 20:09 ` Sean Paul
2017-01-30 20:09 ` Sean Paul
2017-01-31 11:45 ` John Keeping
2017-01-31 11:45 ` John Keeping
2017-01-31 11:45 ` John Keeping
2017-01-31 14:48 ` Sean Paul
2017-01-31 14:48 ` Sean Paul
2017-01-31 14:48 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 07/24] drm/rockchip: dw-mipi-dsi: include bad value in error message John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 18:02 ` Sean Paul
2017-01-30 18:02 ` Sean Paul
2017-01-30 18:02 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 08/24] drm/rockchip: dw-mipi-dsi: respect message flags John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 18:19 ` Sean Paul
2017-01-30 18:19 ` Sean Paul
2017-01-30 18:19 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 09/24] drm/rockchip: dw-mipi-dsi: only request HS clock when required John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 18:20 ` Sean Paul
2017-01-30 18:20 ` Sean Paul
2017-01-30 18:20 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 20:08 ` Sean Paul
2017-01-30 20:08 ` Sean Paul
2017-01-30 20:08 ` Sean Paul
2017-01-31 11:56 ` John Keeping
2017-01-31 11:56 ` John Keeping
2017-01-31 11:56 ` John Keeping
2017-01-31 14:53 ` Sean Paul
2017-01-31 14:53 ` Sean Paul
2017-01-31 14:53 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 11/24] drm/rockchip: dw-mipi-dsi: prepare panel after phy init John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 20:16 ` Sean Paul
2017-01-30 20:16 ` Sean Paul
2017-01-30 20:16 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 12/24] drm/rockchip: dw-mipi-dsi: allow commands in panel_disable John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 20:19 ` Sean Paul
2017-01-30 20:19 ` Sean Paul
2017-01-30 20:19 ` Sean Paul
2017-01-31 12:03 ` John Keeping
2017-01-31 12:03 ` John Keeping
2017-01-31 12:03 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 13/24] drm/rockchip: dw-mipi-dsi: fix escape clock rate John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 20:25 ` Sean Paul
2017-01-30 20:25 ` Sean Paul
2017-01-30 20:25 ` Sean Paul
2017-02-01 17:23 ` John Keeping
2017-02-01 17:23 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 14/24] drm/rockchip: dw-mipi-dsi: ensure PHY is reset John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 20:25 ` Sean Paul
2017-01-30 20:25 ` Sean Paul
2017-01-30 20:25 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 15/24] drm/rockchip: dw-mipi-dsi: configure PHY before enabling John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 20:28 ` Sean Paul
2017-01-30 20:28 ` Sean Paul
2017-01-30 20:28 ` Sean Paul
2017-01-31 12:14 ` John Keeping
2017-01-31 12:14 ` John Keeping
2017-01-31 12:14 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 16/24] drm/rockchip: dw-mipi-dsi: properly configure PHY timing John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 21:57 ` Sean Paul
2017-01-30 21:57 ` Sean Paul
2017-01-30 21:57 ` Sean Paul
2017-01-31 12:39 ` John Keeping
2017-01-31 12:39 ` John Keeping
2017-01-31 12:39 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 17/24] drm/rockchip: dw-mipi-dsi: improve PLL configuration John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 19:03 ` Sean Paul
2017-01-31 19:03 ` Sean Paul
2017-01-31 19:03 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 18/24] drm/rockchip: dw-mipi-dsi: use specific poll helper John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 18:45 ` Sean Paul
2017-01-31 18:45 ` Sean Paul
2017-01-31 18:45 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 19/24] drm/rockchip: dw-mipi-dsi: use positive check for N{H,V}SYNC John Keeping
2017-01-29 13:24 ` [PATCH v3 19/24] drm/rockchip: dw-mipi-dsi: use positive check for N{H, V}SYNC John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 19:12 ` Sean Paul
2017-01-31 19:12 ` Sean Paul
2017-01-31 19:12 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 20/24] drm/rockchip: vop: test for P{H,V}SYNC John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 19:14 ` Sean Paul
2017-01-31 19:14 ` Sean Paul
2017-01-31 19:14 ` Sean Paul
2017-01-29 13:24 ` [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 19:21 ` Sean Paul
2017-01-31 19:21 ` Sean Paul
2017-01-31 19:21 ` Sean Paul
2017-02-10 17:27 ` John Keeping [this message]
2017-02-10 17:27 ` John Keeping
2017-02-10 17:27 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 22/24] drm/rockchip: dw-mipi-dsi: support non-burst modes John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 19:22 ` Sean Paul
2017-01-31 19:22 ` Sean Paul
2017-01-31 19:22 ` Sean Paul
2017-02-16 3:01 ` Chris Zhong
2017-02-16 3:01 ` Chris Zhong
2017-02-16 3:01 ` Chris Zhong
2017-02-16 14:22 ` John Keeping
2017-02-16 14:22 ` John Keeping
2017-02-16 14:22 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 23/24] drm/rockchip: dw-mipi-dsi: add reset control John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-31 19:28 ` Sean Paul
2017-01-31 19:28 ` Sean Paul
2017-01-31 19:28 ` Sean Paul
2017-02-15 3:38 ` Chris Zhong
2017-02-15 3:38 ` Chris Zhong
2017-02-15 3:38 ` Chris Zhong
2017-02-15 12:39 ` John Keeping
2017-02-15 12:39 ` John Keeping
2017-02-15 12:39 ` John Keeping
2017-02-16 2:12 ` Chris Zhong
2017-02-16 2:12 ` Chris Zhong
2017-02-16 2:12 ` Chris Zhong
2017-02-16 14:11 ` John Keeping
2017-02-16 14:11 ` John Keeping
2017-02-16 14:11 ` John Keeping
2017-01-29 13:24 ` [PATCH v3 24/24] drm/rockchip: dw-mipi-dsi: support read commands John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-29 13:24 ` John Keeping
2017-01-30 15:26 ` Sean Paul
2017-01-30 15:26 ` Sean Paul
2017-01-30 15:26 ` Sean Paul
2017-01-30 18:14 ` John Keeping
2017-01-30 18:14 ` John Keeping
2017-01-30 18:14 ` John Keeping
2017-01-30 20:16 ` Sean Paul
2017-01-30 20:16 ` Sean Paul
2017-01-30 20:16 ` Sean Paul
2017-01-31 12:41 ` John Keeping
2017-01-31 12:41 ` John Keeping
2017-01-31 12:41 ` John Keeping
2017-01-31 14:47 ` Sean Paul
2017-01-31 14:47 ` Sean Paul
2017-01-31 14:47 ` Sean Paul
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=20170210172747.5f0afb0a.john@metanate.com \
--to=john@metanate.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.yao@rock-chips.com \
--cc=seanpaul@chromium.org \
--cc=zyw@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 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.