drm/msm: convert to drm_bridge
Drop the msm_connector base class, and special calls to base class
methods from the encoder, and use instead drm_bridge. This allows for a
cleaner division between the hdmi (and in future dsi) blocks, from the
mdp block.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp4/mdp4_kms.c
index 960cd89..5db5bba 100644
--- a/drivers/gpu/drm/msm/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_kms.c
@@ -191,7 +191,6 @@
struct drm_plane *plane;
struct drm_crtc *crtc;
struct drm_encoder *encoder;
- struct drm_connector *connector;
int ret;
/*
@@ -224,13 +223,11 @@
encoder->possible_crtcs = 0x1; /* DTV can be hooked to DMA_E */
priv->encoders[priv->num_encoders++] = encoder;
- connector = hdmi_connector_init(dev, encoder);
- if (IS_ERR(connector)) {
- dev_err(dev->dev, "failed to construct HDMI connector\n");
- ret = PTR_ERR(connector);
+ ret = hdmi_init(dev, encoder);
+ if (ret) {
+ dev_err(dev->dev, "failed to initialize HDMI\n");
goto fail;
}
- priv->connectors[priv->num_connectors++] = connector;
return 0;