@@ -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)
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(-)