From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Andrzej Hajda <a.hajda@samsung.com>, Jernej Skrabec <jernej.skrabec@siol.net>, Jonas Karlman <jonas@kwiboo.se>, Neil Armstrong <narmstrong@baylibre.com>, Sam Ravnborg <sam@ravnborg.org>, Kieran Bingham <kieran.bingham@ideasonboard.com> Subject: [PATCH 26/27] drm: rcar-du: Use drm_bridge_connector_init() helper Date: Tue, 26 May 2020 04:15:04 +0300 [thread overview] Message-ID: <20200526011505.31884-27-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20200526011505.31884-1-laurent.pinchart+renesas@ideasonboard.com> Use the drm_bridge_connector_init() helper to create a drm_connector for each output, instead of relying on the bridge drivers doing so. Attach the bridges with the DRM_BRIDGE_ATTACH_NO_CONNECTOR flag to instruct them not to create a connector. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index 72bf6e2c7933..f6981e6444bc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -10,6 +10,7 @@ #include <linux/export.h> #include <drm/drm_bridge.h> +#include <drm/drm_bridge_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_panel.h> @@ -49,6 +50,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, struct device_node *enc_node) { struct rcar_du_encoder *renc; + struct drm_connector *connector; struct drm_encoder *encoder; struct drm_bridge *bridge; int ret; @@ -109,17 +111,26 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, if (ret < 0) goto done; - /* - * Attach the bridge to the encoder. The bridge will create the - * connector. - */ - ret = drm_bridge_attach(encoder, bridge, NULL, 0); + /* Attach the bridge to the encoder. */ + ret = drm_bridge_attach(encoder, bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) { dev_err(rcdu->dev, "failed to attach bridge for output %u\n", output); goto done; } + /* Create the connector for the chain of bridges. */ + connector = drm_bridge_connector_init(rcdu->ddev, encoder); + if (IS_ERR(connector)) { + dev_err(rcdu->dev, + "failed to created connector for output %u\n", output); + ret = PTR_ERR(connector); + goto done; + } + + ret = drm_connector_attach_encoder(connector, encoder); + done: if (ret < 0) { if (encoder->name) -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: Jernej Skrabec <jernej.skrabec@siol.net>, Neil Armstrong <narmstrong@baylibre.com>, Jonas Karlman <jonas@kwiboo.se>, Kieran Bingham <kieran.bingham@ideasonboard.com>, linux-renesas-soc@vger.kernel.org, Andrzej Hajda <a.hajda@samsung.com>, Sam Ravnborg <sam@ravnborg.org> Subject: [PATCH 26/27] drm: rcar-du: Use drm_bridge_connector_init() helper Date: Tue, 26 May 2020 04:15:04 +0300 [thread overview] Message-ID: <20200526011505.31884-27-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20200526011505.31884-1-laurent.pinchart+renesas@ideasonboard.com> Use the drm_bridge_connector_init() helper to create a drm_connector for each output, instead of relying on the bridge drivers doing so. Attach the bridges with the DRM_BRIDGE_ATTACH_NO_CONNECTOR flag to instruct them not to create a connector. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index 72bf6e2c7933..f6981e6444bc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -10,6 +10,7 @@ #include <linux/export.h> #include <drm/drm_bridge.h> +#include <drm/drm_bridge_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_panel.h> @@ -49,6 +50,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, struct device_node *enc_node) { struct rcar_du_encoder *renc; + struct drm_connector *connector; struct drm_encoder *encoder; struct drm_bridge *bridge; int ret; @@ -109,17 +111,26 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, if (ret < 0) goto done; - /* - * Attach the bridge to the encoder. The bridge will create the - * connector. - */ - ret = drm_bridge_attach(encoder, bridge, NULL, 0); + /* Attach the bridge to the encoder. */ + ret = drm_bridge_attach(encoder, bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) { dev_err(rcdu->dev, "failed to attach bridge for output %u\n", output); goto done; } + /* Create the connector for the chain of bridges. */ + connector = drm_bridge_connector_init(rcdu->ddev, encoder); + if (IS_ERR(connector)) { + dev_err(rcdu->dev, + "failed to created connector for output %u\n", output); + ret = PTR_ERR(connector); + goto done; + } + + ret = drm_connector_attach_encoder(connector, encoder); + done: if (ret < 0) { if (encoder->name) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-26 1:15 UTC|newest] Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-26 1:14 [PATCH 00/27] Converter R-Car DU to the DRM bridge connector helper Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 01/27] drm: bridge: adv7511: Split EDID read to a separate function Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 02/27] drm: bridge: adv7511: Split connector creation " Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 03/27] drm: bridge: adv7511: Implement bridge connector operations Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-06-21 8:25 ` Sam Ravnborg 2020-06-21 8:25 ` Sam Ravnborg 2020-05-26 1:14 ` [PATCH 04/27] drm: bridge: adv7511: Make connector creation optional Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 05/27] drm: bridge: Return NULL on error from drm_bridge_get_edid() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-06-21 8:26 ` Sam Ravnborg 2020-06-21 8:26 ` Sam Ravnborg 2020-05-26 1:14 ` [PATCH 06/27] drm: bridge: simple-bridge: Delegate operations to next bridge Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 07/27] drm: bridge: simple-bridge: Make connector creation optional Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 08/27] drm: rcar-du: lvds: Convert to DRM panel bridge helper Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` [PATCH 09/27] drm: edid: Constify connector argument to infoframe functions Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-06-21 8:27 ` Sam Ravnborg 2020-06-21 8:27 ` Sam Ravnborg 2020-05-26 1:14 ` [PATCH 10/27] drm: bridge: Pass drm_display_info to drm_bridge_funcs .mode_valid() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 12:51 ` Neil Armstrong 2020-05-26 12:51 ` Neil Armstrong 2020-05-26 12:59 ` Boris Brezillon 2020-05-26 12:59 ` Boris Brezillon 2020-05-26 14:05 ` Guido Günther 2020-05-26 14:05 ` Guido Günther 2020-05-26 1:14 ` [PATCH 11/27] drm: bridge: dw-hdmi: Pass private data pointer to .mode_valid() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:44 ` Neil Armstrong 2020-05-26 9:44 ` Neil Armstrong 2020-05-26 9:44 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 12/27] drm: bridge: dw-hdmi: Pass private data pointer to .configure_phy() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:45 ` Neil Armstrong 2020-05-26 9:45 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 13/27] drm: bridge: dw-hdmi: Remove unused field from dw_hdmi_plat_data Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:45 ` Neil Armstrong 2020-05-26 9:45 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 14/27] drm: meson: dw-hdmi: Use dw_hdmi context to replace hack Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 12:32 ` Neil Armstrong 2020-05-26 12:32 ` Neil Armstrong 2020-05-26 12:32 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 15/27] drm: bridge: dw-hdmi: Pass drm_display_info to .mode_valid() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 16/27] drm: bridge: dw-hdmi: Constify mode argument to dw_hdmi_phy_ops .init() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 17/27] drm: bridge: dw-hdmi: Constify mode argument to internal functions Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 9:46 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 18/27] drm: bridge: dw-hdmi: Pass drm_display_info to dw_hdmi_support_scdc() Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:48 ` Neil Armstrong 2020-05-26 9:48 ` Neil Armstrong 2020-05-26 9:48 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 19/27] drm: bridge: dw-hdmi: Split connector creation to a separate function Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 9:49 ` Neil Armstrong 2020-05-26 9:49 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 20/27] drm: bridge: dw-hdmi: Store current connector in struct dw_hdmi Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 12:29 ` Neil Armstrong 2020-05-26 12:29 ` Neil Armstrong 2020-05-26 1:14 ` [PATCH 21/27] drm: bridge: dw-hdmi: Pass drm_connector to internal functions as needed Laurent Pinchart 2020-05-26 1:14 ` Laurent Pinchart 2020-05-26 12:29 ` Neil Armstrong 2020-05-26 12:29 ` Neil Armstrong 2020-05-26 1:15 ` [PATCH 22/27] drm: bridge: dw-hdmi: Make connector creation optional Laurent Pinchart 2020-05-26 1:15 ` Laurent Pinchart 2020-05-26 12:35 ` Neil Armstrong 2020-05-26 12:35 ` Neil Armstrong 2020-06-07 1:19 ` Laurent Pinchart 2020-06-07 1:19 ` Laurent Pinchart 2020-05-26 1:15 ` [PATCH 23/27] drm: bridge: dw-hdmi: Attach to next bridge if available Laurent Pinchart 2020-05-26 1:15 ` Laurent Pinchart 2020-05-26 12:50 ` Neil Armstrong 2020-05-26 12:50 ` Neil Armstrong 2020-05-26 14:23 ` Jonas Karlman 2020-05-26 14:23 ` Jonas Karlman 2020-06-07 1:24 ` Laurent Pinchart 2020-06-07 1:24 ` Laurent Pinchart 2020-06-07 1:22 ` Laurent Pinchart 2020-06-07 1:22 ` Laurent Pinchart 2020-05-26 1:15 ` [PATCH 24/27] drm: rcar-du: dw-hdmi: Set output port number Laurent Pinchart 2020-05-26 1:15 ` Laurent Pinchart 2020-05-26 1:15 ` [PATCH 25/27] drm: rcar-du: Fix error handling in rcar_du_encoder_init() Laurent Pinchart 2020-05-26 1:15 ` Laurent Pinchart 2020-05-26 1:15 ` Laurent Pinchart [this message] 2020-05-26 1:15 ` [PATCH 26/27] drm: rcar-du: Use drm_bridge_connector_init() helper Laurent Pinchart 2020-05-26 1:15 ` [PATCH 27/27] drm: Add default modes for connectors in unknown state Laurent Pinchart 2020-05-26 1:15 ` Laurent Pinchart 2020-06-21 8:40 ` Sam Ravnborg 2020-06-21 8:40 ` Sam Ravnborg 2020-06-24 1:12 ` Laurent Pinchart 2020-06-24 1:12 ` Laurent Pinchart 2020-06-24 7:23 ` Daniel Vetter 2020-06-24 7:23 ` Daniel Vetter 2020-06-24 15:24 ` Alex Deucher 2020-06-24 15:24 ` Alex Deucher 2020-06-24 19:31 ` Daniel Vetter 2020-06-24 19:31 ` Daniel Vetter 2020-06-24 19:40 ` Alex Deucher 2020-06-24 19:40 ` Alex Deucher 2020-06-25 7:56 ` Daniel Vetter 2020-06-25 7:56 ` Daniel Vetter 2020-06-25 7:57 ` Daniel Vetter 2020-06-25 7:57 ` Daniel Vetter 2020-06-25 10:31 ` Pekka Paalanen 2020-06-25 10:31 ` Pekka Paalanen 2020-06-25 10:44 ` Daniel Vetter 2020-06-25 10:44 ` Daniel Vetter 2020-06-26 8:59 ` Pekka Paalanen 2020-06-26 8:59 ` Pekka Paalanen 2020-06-26 9:25 ` Daniel Stone 2020-06-26 9:25 ` Daniel Stone 2020-06-26 13:35 ` Daniel Vetter 2020-06-26 13:35 ` Daniel Vetter 2020-06-24 22:47 ` Laurent Pinchart 2020-06-24 22:47 ` Laurent Pinchart 2020-06-23 18:55 ` [PATCH 00/27] Converter R-Car DU to the DRM bridge connector helper Sam Ravnborg 2020-06-23 18:55 ` Sam Ravnborg 2020-06-25 8:48 ` Liu Ying 2020-06-25 8:48 ` Liu Ying 2020-06-27 19:55 ` Sam Ravnborg 2020-06-27 19:55 ` Sam Ravnborg 2020-06-28 8:28 ` Laurent Pinchart 2020-06-28 8:28 ` Laurent Pinchart
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=20200526011505.31884-27-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jernej.skrabec@siol.net \ --cc=jonas@kwiboo.se \ --cc=kieran.bingham@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=narmstrong@baylibre.com \ --cc=sam@ravnborg.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.