From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: jagan@amarulasolutions.com, Andrzej Hajda <a.hajda@samsung.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Chen-Yu Tsai <wens@csie.org>,
Maxime Ripard <maxime.ripard@bootlin.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com,
Michael Trimarchi <michael@amarulasolutions.com>,
linux-amarula@amarulasolutions.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [linux-sunxi] [PATCH 3/6] drm/sun4i: dsi: Add bridge support
Date: Fri, 15 Mar 2019 14:32:55 +0100 [thread overview]
Message-ID: <c232d5620d6a3272a6064ce9ccdec5c86a3a7950.camel@bootlin.com> (raw)
In-Reply-To: <20190315130825.9005-4-jagan@amarulasolutions.com>
Hi,
On Fri, 2019-03-15 at 18:38 +0530, Jagan Teki wrote:
> Some display panels would come up with a non-DSI output which
> can have an option to connect DSI interface by means of bridge
> convertor.
>
> This DSI to non-DSI bridge convertor would require a bridge
> driver that would communicate the DSI controller for bridge
> functionalities.
>
> So, add support for bridge functionalities in Allwinner DSI
> controller.
See a few comments below.
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 65 +++++++++++++++++++-------
> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 1 +
> 2 files changed, 49 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> index 0960b96b62cc..64d74313b842 100644
> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> @@ -781,6 +781,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder)
> if (!IS_ERR(dsi->panel))
> drm_panel_prepare(dsi->panel);
>
> + if (!IS_ERR(dsi->bridge))
> + drm_bridge_pre_enable(dsi->bridge);
> +
> /*
> * FIXME: This should be moved after the switch to HS mode.
> *
> @@ -796,6 +799,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder)
> if (!IS_ERR(dsi->panel))
> drm_panel_enable(dsi->panel);
>
> + if (!IS_ERR(dsi->bridge))
> + drm_bridge_enable(dsi->bridge);
> +
> sun6i_dsi_start(dsi, DSI_START_HSC);
>
> udelay(1000);
> @@ -812,6 +818,9 @@ static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder)
> if (!IS_ERR(dsi->panel)) {
> drm_panel_disable(dsi->panel);
> drm_panel_unprepare(dsi->panel);
> + } else if (!IS_ERR(dsi->bridge)) {
> + drm_bridge_disable(dsi->bridge);
> + drm_bridge_post_disable(dsi->bridge);
> }
>
> phy_power_off(dsi->dphy);
> @@ -973,11 +982,16 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host,
> struct sun6i_dsi *dsi = host_to_sun6i_dsi(host);
>
> dsi->device = device;
> - dsi->panel = of_drm_find_panel(device->dev.of_node);
> - if (IS_ERR(dsi->panel))
> - return PTR_ERR(dsi->panel);
>
> - dev_info(host->dev, "Attached device %s\n", device->name);
> + dsi->bridge = of_drm_find_bridge(device->dev.of_node);
> + if (!dsi->bridge) {
You are using IS_ERR to check that the bridge is alive in the changes
above, but switch to checking that it's non-NULL at this point.
Are both guaranteed to be interchangeable?
> + dsi->panel = of_drm_find_panel(device->dev.of_node);
> + if (IS_ERR(dsi->panel))
> + return PTR_ERR(dsi->panel);
> + }
You should probably use drm_of_find_panel_or_bridge instead of
duplicating the logic here.
> + dev_info(host->dev, "Attached %s %s\n",
> + dsi->bridge ? "bridge" : "panel", device->name);
>
> return 0;
> }
> @@ -1055,8 +1069,10 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
> struct sun4i_tcon *tcon0 = sun4i_get_tcon0(drm);
> int ret;
>
> - if (!dsi->panel)
> + if (!(dsi->panel || dsi->bridge)) {
> + dev_info(drm->dev, "No panel or bridge found... DSI output disabled\n");
> return -EPROBE_DEFER;
> + }
>
> dsi->drv = drv;
>
> @@ -1078,19 +1094,29 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
> }
> dsi->encoder.possible_crtcs = BIT(0);
>
> - drm_connector_helper_add(&dsi->connector,
> - &sun6i_dsi_connector_helper_funcs);
> - ret = drm_connector_init(drm, &dsi->connector,
> - &sun6i_dsi_connector_funcs,
> - DRM_MODE_CONNECTOR_DSI);
> - if (ret) {
> - dev_err(dsi->dev,
> - "Couldn't initialise the DSI connector\n");
> - goto err_cleanup_connector;
> + if (dsi->panel) {
> + drm_connector_helper_add(&dsi->connector,
> + &sun6i_dsi_connector_helper_funcs);
> + ret = drm_connector_init(drm, &dsi->connector,
> + &sun6i_dsi_connector_funcs,
> + DRM_MODE_CONNECTOR_DSI);
> + if (ret) {
> + dev_err(dsi->dev,
> + "Couldn't initialise the DSI connector\n");
> + goto err_cleanup_connector;
> + }
> +
> + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder);
> + drm_panel_attach(dsi->panel, &dsi->connector);
> }
>
> - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder);
> - drm_panel_attach(dsi->panel, &dsi->connector);
> + if (dsi->bridge) {
> + ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL);
> + if (ret) {
> + dev_err(dsi->dev, "Couldn't attach the DSI bridge\n");
> + goto err_cleanup_connector;
> + }
> + }
>
> return 0;
>
> @@ -1104,7 +1130,12 @@ static void sun6i_dsi_unbind(struct device *dev, struct device *master,
> {
> struct sun6i_dsi *dsi = dev_get_drvdata(dev);
>
> - drm_panel_detach(dsi->panel);
> + if (dsi->panel)
> + drm_panel_detach(dsi->panel);
> +
> + if (dsi->bridge)
> + drm_bridge_detach(dsi->bridge);
As I mentionned in the first patch, this is quite suspicious since the
DRM core should be in charge of detaching the bridge, not the driver.
Cheers,
Paul
> +
> }
>
> static const struct component_ops sun6i_dsi_ops = {
> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
> index 5c4983212f89..76874ff8e3ef 100644
> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
> @@ -36,6 +36,7 @@ struct sun6i_dsi {
> struct sun4i_tcon *tcon;
> struct mipi_dsi_device *device;
> struct drm_panel *panel;
> + struct drm_bridge *bridge;
> const struct sun6i_dsi_variant *variant;
> };
>
> --
> 2.18.0.321.gffc6fa0e3
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-15 13:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-15 13:08 [PATCH 0/6] drm/bridge: Add ICN6211 MIPI-DSI/RGB bridge Jagan Teki
2019-03-15 13:08 ` [PATCH 1/6] drm/bridge: Export drm_bridge_detach Jagan Teki
2019-03-15 13:27 ` [linux-sunxi] " Paul Kocialkowski
2019-03-18 16:48 ` Jagan Teki
2019-03-18 16:57 ` Paul Kocialkowski
2019-03-18 17:07 ` Jagan Teki
2019-03-15 13:08 ` [PATCH 2/6] drm/exynos: dsi: Use drm_bridge_detach Jagan Teki
2019-03-19 3:59 ` Inki Dae
2019-03-15 13:08 ` [PATCH 3/6] drm/sun4i: dsi: Add bridge support Jagan Teki
2019-03-15 13:32 ` Paul Kocialkowski [this message]
2019-03-15 13:45 ` [linux-sunxi] " Maxime Ripard
2019-03-15 13:48 ` Paul Kocialkowski
2019-05-22 12:01 ` Jagan Teki
2019-03-15 13:08 ` [PATCH 4/6] dt-bindings: display: bridge: Add ICN6211 MIPI-DSI to RGB convertor bridge Jagan Teki
2019-03-15 13:34 ` Maxime Ripard
2019-03-18 16:58 ` Jagan Teki
2019-03-19 2:59 ` [linux-sunxi] " Chen-Yu Tsai
2019-03-19 7:48 ` Jagan Teki
2019-03-19 8:35 ` Maxime Ripard
2019-03-15 13:08 ` [PATCH 5/6] drm/bridge: Add Chipone ICN6211 MIPI-DSI/RGB " Jagan Teki
2019-03-15 13:33 ` Maxime Ripard
2019-03-17 16:30 ` Laurent Pinchart
2019-03-18 17:59 ` Jagan Teki
2019-03-19 3:05 ` [linux-sunxi] " Chen-Yu Tsai
2019-03-15 13:08 ` [PATCH 6/6] arm64: dts: allwinner: bananapi-m64: Enable S070WV20-CT16 DSI panel Jagan Teki
2019-03-15 13:25 ` 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=c232d5620d6a3272a6064ce9ccdec5c86a3a7950.camel@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jagan@amarulasolutions.com \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=michael@amarulasolutions.com \
--cc=robh+dt@kernel.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: 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).