| Message ID | 20201216005021.19518-5-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | Converter R-Car DU to the DRM bridge connector helper | expand |
Hi Laurent, On Wed, Dec 16, 2020 at 02:50:21AM +0200, Laurent Pinchart wrote: > 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 | 25 ++++++++++++++++++----- > 1 file changed, 20 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 ba8c6038cd63..10a66091391a 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > @@ -11,6 +11,7 @@ > #include <linux/slab.h> > > #include <drm/drm_bridge.h> > +#include <drm/drm_bridge_connector.h> > #include <drm/drm_crtc.h> > #include <drm/drm_managed.h> > #include <drm/drm_modeset_helper_vtables.h> > @@ -61,6 +62,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_bridge *bridge; > int ret; > > @@ -122,9 +124,22 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, > if (ret) > return ret; > > - /* > - * Attach the bridge to the encoder. The bridge will create the > - * connector. > - */ > - return drm_bridge_attach(&renc->base, bridge, NULL, 0); > + /* Attach the bridge to the encoder. */ > + ret = drm_bridge_attach(&renc->base, bridge, NULL, > + DRM_BRIDGE_ATTACH_NO_CONNECTOR); > + if (ret) { > + dev_err(rcdu->dev, "failed to attach bridge for output %u\n", > + output); > + return ret; > + } > + > + /* Create the connector for the chain of bridges. */ > + connector = drm_bridge_connector_init(&rcdu->ddev, &renc->base); > + if (IS_ERR(connector)) { > + dev_err(rcdu->dev, > + "failed to created connector for output %u\n", output); > + return PTR_ERR(connector); > + } > + > + return drm_connector_attach_encoder(connector, &renc->base); Looks good Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org> I'm trying to figure out how deferred probe of a panel directly connected to the lvds encoder work. I assume there's no risk of creating the connector before the panel is probed, or this is not an issue. > } > -- > Regards, > > Laurent Pinchart >
Hi Jacopo, On Wed, Dec 16, 2020 at 12:53:19PM +0100, Jacopo Mondi wrote: > On Wed, Dec 16, 2020 at 02:50:21AM +0200, Laurent Pinchart wrote: > > 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 | 25 ++++++++++++++++++----- > > 1 file changed, 20 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 ba8c6038cd63..10a66091391a 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > > @@ -11,6 +11,7 @@ > > #include <linux/slab.h> > > > > #include <drm/drm_bridge.h> > > +#include <drm/drm_bridge_connector.h> > > #include <drm/drm_crtc.h> > > #include <drm/drm_managed.h> > > #include <drm/drm_modeset_helper_vtables.h> > > @@ -61,6 +62,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_bridge *bridge; > > int ret; > > > > @@ -122,9 +124,22 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, > > if (ret) > > return ret; > > > > - /* > > - * Attach the bridge to the encoder. The bridge will create the > > - * connector. > > - */ > > - return drm_bridge_attach(&renc->base, bridge, NULL, 0); > > + /* Attach the bridge to the encoder. */ > > + ret = drm_bridge_attach(&renc->base, bridge, NULL, > > + DRM_BRIDGE_ATTACH_NO_CONNECTOR); > > + if (ret) { > > + dev_err(rcdu->dev, "failed to attach bridge for output %u\n", > > + output); > > + return ret; > > + } > > + > > + /* Create the connector for the chain of bridges. */ > > + connector = drm_bridge_connector_init(&rcdu->ddev, &renc->base); > > + if (IS_ERR(connector)) { > > + dev_err(rcdu->dev, > > + "failed to created connector for output %u\n", output); > > + return PTR_ERR(connector); > > + } > > + > > + return drm_connector_attach_encoder(connector, &renc->base); > > Looks good > Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org> > > I'm trying to figure out how deferred probe of a panel directly > connected to the lvds encoder work. I assume there's no risk of > creating the connector before the panel is probed, or this is not an > issue. If the panel isn't probed yet, the call to drm_of_find_panel_or_bridge() in rcar_lvds_parse_dt() will defer probing of the LVDS encoder, which in turn will defer probind of the DU as the LVDS bridge won't be registered. > > }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index ba8c6038cd63..10a66091391a 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -11,6 +11,7 @@ #include <linux/slab.h> #include <drm/drm_bridge.h> +#include <drm/drm_bridge_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_managed.h> #include <drm/drm_modeset_helper_vtables.h> @@ -61,6 +62,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_bridge *bridge; int ret; @@ -122,9 +124,22 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, if (ret) return ret; - /* - * Attach the bridge to the encoder. The bridge will create the - * connector. - */ - return drm_bridge_attach(&renc->base, bridge, NULL, 0); + /* Attach the bridge to the encoder. */ + ret = drm_bridge_attach(&renc->base, bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret) { + dev_err(rcdu->dev, "failed to attach bridge for output %u\n", + output); + return ret; + } + + /* Create the connector for the chain of bridges. */ + connector = drm_bridge_connector_init(&rcdu->ddev, &renc->base); + if (IS_ERR(connector)) { + dev_err(rcdu->dev, + "failed to created connector for output %u\n", output); + return PTR_ERR(connector); + } + + return drm_connector_attach_encoder(connector, &renc->base); }
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 | 25 ++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)