From: Peter Senna Tschudin <peter.senna@collabora.com>
To: airlied@linux.ie, akpm@linux-foundation.org, davem@davemloft.net,
devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org,
enric.balletbo@collabora.com, galak@codeaurora.org,
gregkh@linuxfoundation.org, heiko@sntech.de,
ijc+devicetree@hellion.org.uk, jslaby@suse.cz,
kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org,
linux@armlinux.org.uk, linux-kernel@vger.kernel.org,
linux@roeck-us.net, mark.rutland@arm.com, martin.donnelly@ge.com,
martyn.welch@collabora.co.uk, mchehab@osg.samsung.com,
pawel.moll@arm.com, peter.senna@collabora.com,
p.zabel@pengutronix.de, rmk+kernel@armlinux.org.uk,
robh+dt@kernel.org, shawnguo@kernel.org, tiwai@suse.com,
treding@nvidia.com, ykk@rock-chips.com
Subject: [PATCH 1/5] drm/imx-ldb: Add support to drm-bridge
Date: Mon, 30 May 2016 18:39:41 +0200 [thread overview]
Message-ID: <1464626385-19253-2-git-send-email-peter.senna@collabora.com> (raw)
In-Reply-To: <1464626385-19253-1-git-send-email-peter.senna@collabora.com>
Add support to attach a drm_bridge to imx-ldb in addition to
existing support to attach a LVDS panel.
Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
drivers/gpu/drm/imx/imx-ldb.c | 75 +++++++++++++++++++++++++++++++------------
1 file changed, 54 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index a58eee5..7233a81 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -57,7 +57,11 @@ struct imx_ldb_channel {
struct imx_ldb *ldb;
struct drm_connector connector;
struct drm_encoder encoder;
+
+ /* Defines what is connected to the ldb, only one at a time */
struct drm_panel *panel;
+ struct drm_bridge *ext_bridge;
+
struct device_node *child;
int chno;
void *edid;
@@ -295,6 +299,10 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,
}
}
+static void imx_ldb_encoder_enable(struct drm_encoder *encoder)
+{
+}
+
static void imx_ldb_encoder_disable(struct drm_encoder *encoder)
{
struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
@@ -373,6 +381,7 @@ static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {
.prepare = imx_ldb_encoder_prepare,
.commit = imx_ldb_encoder_commit,
.mode_set = imx_ldb_encoder_mode_set,
+ .enable = imx_ldb_encoder_enable,
.disable = imx_ldb_encoder_disable,
};
@@ -417,16 +426,28 @@ static int imx_ldb_register(struct drm_device *drm,
drm_encoder_init(drm, &imx_ldb_ch->encoder, &imx_ldb_encoder_funcs,
DRM_MODE_ENCODER_LVDS, NULL);
- drm_connector_helper_add(&imx_ldb_ch->connector,
- &imx_ldb_connector_helper_funcs);
- drm_connector_init(drm, &imx_ldb_ch->connector,
- &imx_ldb_connector_funcs, DRM_MODE_CONNECTOR_LVDS);
-
- if (imx_ldb_ch->panel)
+ if (imx_ldb_ch->panel) {
+ drm_connector_helper_add(&imx_ldb_ch->connector,
+ &imx_ldb_connector_helper_funcs);
+ drm_connector_init(drm, &imx_ldb_ch->connector,
+ &imx_ldb_connector_funcs,
+ DRM_MODE_CONNECTOR_LVDS);
drm_panel_attach(imx_ldb_ch->panel, &imx_ldb_ch->connector);
- drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
- &imx_ldb_ch->encoder);
+ drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
+ &imx_ldb_ch->encoder);
+ }
+
+ if (imx_ldb_ch->ext_bridge) {
+ imx_ldb_ch->ext_bridge->encoder = &imx_ldb_ch->encoder;
+
+ imx_ldb_ch->encoder.bridge = imx_ldb_ch->ext_bridge;
+ ret = drm_bridge_attach(drm, imx_ldb_ch->ext_bridge);
+ if (ret) {
+ DRM_ERROR("Failed to initialize bridge with drm\n");
+ return ret;
+ }
+ }
return 0;
}
@@ -583,23 +604,35 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
endpoint = of_get_child_by_name(port, "endpoint");
if (endpoint) {
remote = of_graph_get_remote_port_parent(endpoint);
- if (remote)
- channel->panel = of_drm_find_panel(remote);
- else
- return -EPROBE_DEFER;
- if (!channel->panel) {
- dev_err(dev, "panel not found: %s\n",
- remote->full_name);
- return -EPROBE_DEFER;
+ if (remote) {
+ /* Only one of these two will succeed */
+ channel->panel =
+ of_drm_find_panel(remote);
+
+ channel->ext_bridge =
+ of_drm_find_bridge(remote);
+
+ /*
+ * If the bridge is compiled as a
+ * module, it may take some time until
+ * the bridge driver is available.
+ * Defer until the bridge driver is
+ * ready.
+ */
+ if (!channel->panel &&
+ !channel->ext_bridge)
+ return -EPROBE_DEFER;
}
}
}
- edidp = of_get_property(child, "edid", &channel->edid_len);
- if (edidp) {
- channel->edid = kmemdup(edidp, channel->edid_len,
- GFP_KERNEL);
- } else if (!channel->panel) {
+ if (channel->panel) {
+ edidp = of_get_property(child, "edid",
+ &channel->edid_len);
+ if (edidp)
+ channel->edid = kmemdup(edidp,
+ channel->edid_len, GFP_KERNEL);
+ } else {
ret = of_get_drm_display_mode(child, &channel->mode, 0);
if (!ret)
channel->mode_valid = 1;
--
2.5.5
next prev parent reply other threads:[~2016-05-30 16:42 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-30 16:39 [PATCH 0/5] Add driver for GE B850v3 LVDS/DP++ Bridge Peter Senna Tschudin
2016-05-30 16:39 ` Peter Senna Tschudin [this message]
2016-06-02 13:09 ` [PATCH 1/5] drm/imx-ldb: Add support to drm-bridge Philipp Zabel
2016-05-30 16:39 ` [PATCH 2/5] arm/dts/imx6q-b850v3: Configure IPU assignment order Peter Senna Tschudin
2016-05-30 16:49 ` Fabio Estevam
2016-06-02 12:55 ` Philipp Zabel
2016-05-30 16:39 ` [PATCH 3/5] Documentation/devicetree/bindings: Add b850v3_lvds_dp Peter Senna Tschudin
2016-06-02 12:49 ` Philipp Zabel
2016-06-02 23:19 ` Peter Senna Tschudin
2016-06-02 22:57 ` Rob Herring
2016-05-30 16:39 ` [PATCH 4/5] drm/bridge: Add driver for GE B850v3 LVDS/DP++ Bridge Peter Senna Tschudin
2016-05-31 7:48 ` Enric Balletbo Serra
2016-05-30 16:39 ` [PATCH 5/5] arm/dts/imx6q-b850v3: Use " Peter Senna Tschudin
2016-05-30 16:54 ` Fabio Estevam
2016-06-09 16:25 ` [PATCH V2 0/5] Add driver for " Peter Senna Tschudin
2016-06-09 16:25 ` [PATCH V2 1/5] drm/imx-ldb: Add support to drm-bridge Peter Senna Tschudin
2016-06-09 16:25 ` [PATCH V2 2/5] dts/imx6q-b850v3: Configure IPU assignment order Peter Senna Tschudin
2016-06-09 16:25 ` [PATCH V2 3/5] Documentation/devicetree/bindings: b850v3_lvds_dp Peter Senna Tschudin
2016-06-10 17:42 ` Rob Herring
2016-06-10 18:54 ` Javier Martinez Canillas
2016-06-09 16:25 ` [PATCH V2 4/5] drm/bridge: Add driver for GE B850v3 LVDS/DP++ Bridge Peter Senna Tschudin
2016-06-10 7:39 ` Enric Balletbo Serra
2016-06-10 9:44 ` Peter Senna Tschudin
2016-06-10 14:13 ` Daniel Vetter
2016-06-22 8:34 ` Archit Taneja
2016-06-09 16:25 ` [PATCH V2 5/5] dts/imx6q-b850v3: Use " Peter Senna Tschudin
2016-07-31 19:55 ` [PATCH V3 0/5] Add driver for " Peter Senna Tschudin
2016-07-31 19:55 ` [PATCH V3 1/5] drm/imx-ldb: Add support to drm-bridge Peter Senna Tschudin
2016-08-01 10:21 ` Philipp Zabel
2016-08-02 18:46 ` Peter Senna Tschudin
2016-07-31 19:55 ` [PATCH V3 2/5] dts/imx6q-b850v3: Configure IPU assignment order Peter Senna Tschudin
2016-08-01 8:54 ` Lucas Stach
2016-08-01 12:30 ` Peter Senna Tschudin
2016-08-02 13:13 ` Daniel Vetter
2016-07-31 19:55 ` [PATCH V3 3/5] Documentation/devicetree/bindings: b850v3_lvds_dp Peter Senna Tschudin
2016-08-01 16:59 ` Rob Herring
2016-07-31 19:55 ` [PATCH V3 4/5] drm/bridge: Add driver for GE B850v3 LVDS/DP++ Bridge Peter Senna Tschudin
2016-07-31 19:55 ` [PATCH V3 5/5] dts/imx6q-b850v3: Use " Peter Senna Tschudin
2016-08-04 22:36 ` [PATCH V4 0/4] Add driver for " Peter Senna Tschudin
2016-08-04 22:36 ` [PATCH V4 1/4] drm/imx-ldb: Add support to drm-bridge Peter Senna Tschudin
2016-08-16 15:40 ` Martyn Welch
2016-08-04 22:36 ` [PATCH V4 2/4] Documentation/devicetree/bindings: b850v3_lvds_dp Peter Senna Tschudin
2016-08-05 7:28 ` Enric Balletbo Serra
2016-08-16 15:59 ` Martyn Welch
2016-08-04 22:37 ` [PATCH V4 3/4] drm/bridge: Add driver for GE B850v3 LVDS/DP++ Bridge Peter Senna Tschudin
2016-08-05 7:38 ` Enric Balletbo Serra
2016-08-04 22:37 ` [PATCH V4 4/4] dts/imx6q-b850v3: Use " Peter Senna Tschudin
2016-08-09 16:41 ` [PATCH V5 0/4] Add driver for " Peter Senna Tschudin
2016-08-09 16:41 ` [PATCH V5 1/4] drm/imx-ldb: Add support to drm-bridge Peter Senna Tschudin
2016-08-11 9:38 ` Philipp Zabel
2016-08-09 16:41 ` [PATCH V5 2/4] Documentation/devicetree/bindings: b850v3_lvds_dp Peter Senna Tschudin
2016-09-26 8:26 ` Peter Senna Tschudin
2016-08-09 16:41 ` [PATCH V5 3/4] drm/bridge: Add driver for GE B850v3 LVDS/DP++ Bridge Peter Senna Tschudin
2016-08-16 4:15 ` Archit Taneja
2016-09-26 8:27 ` Peter Senna Tschudin
2016-09-26 8:31 ` Archit Taneja
2016-09-26 8:58 ` Peter Senna Tschudin
2016-09-26 10:28 ` Archit Taneja
2016-09-26 10:29 ` Archit Taneja
2016-09-26 11:54 ` Peter Senna Tschudin
2016-09-26 12:54 ` Archit Taneja
2016-08-09 16:41 ` [PATCH V5 4/4] dts/imx6q-b850v3: Use " Peter Senna Tschudin
2016-09-26 8:27 ` Peter Senna Tschudin
2016-09-29 10:39 ` Shawn Guo
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=1464626385-19253-2-git-send-email-peter.senna@collabora.com \
--to=peter.senna@collabora.com \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=enric.balletbo@collabora.com \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jslaby@suse.cz \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=martin.donnelly@ge.com \
--cc=martyn.welch@collabora.co.uk \
--cc=mchehab@osg.samsung.com \
--cc=p.zabel@pengutronix.de \
--cc=pawel.moll@arm.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=tiwai@suse.com \
--cc=treding@nvidia.com \
--cc=ykk@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).