Skip to content

L
linux
Commit ec141af6 authored by Archit Taneja's avatar Archit Taneja Committed by Rob Clark
Browse files
Options

drm/msm/mdp4: Clean up modeset_init 

modeset_init() for mdp4 isn't very flexible. That makes it hard to add
more interfaces.

Split out the encoder/connector creation code in modeset_init into a
separate function. This is similar to what's done in modeset_init for
mdp5.
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 66a42f85
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 83 deletions
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
View file @ ec141af6
...@@ -270,117 +270,143 @@ static struct drm_panel *detect_panel(struct drm_device *dev) ...@@ -270,117 +270,143 @@ static struct drm_panel *detect_panel(struct drm_device *dev)
return panel; return panel;
} }
static int modeset_init(struct mdp4_kms *mdp4_kms) static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
int intf_type)
{ {
struct drm_device *dev = mdp4_kms->dev; struct drm_device *dev = mdp4_kms->dev;
struct msm_drm_private *priv = dev->dev_private; struct msm_drm_private *priv = dev->dev_private;
struct drm_plane *plane;
struct drm_crtc *crtc;
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_panel *panel; struct drm_panel *panel;
int ret; int ret;
/* construct non-private planes: */ switch (intf_type) {
plane = mdp4_plane_init(dev, VG1, false); case DRM_MODE_ENCODER_LVDS:
if (IS_ERR(plane)) { panel = detect_panel(dev);
dev_err(dev->dev, "failed to construct plane for VG1\n"); if (IS_ERR(panel)) {
ret = PTR_ERR(plane); dev_err(dev->dev, "failed to detect LVDS panel\n");
goto fail; return PTR_ERR(panel);
} }
priv->planes[priv->num_planes++] = plane;
plane = mdp4_plane_init(dev, VG2, false); encoder = mdp4_lcdc_encoder_init(dev, panel);
if (IS_ERR(plane)) { if (IS_ERR(encoder)) {
dev_err(dev->dev, "failed to construct plane for VG2\n"); dev_err(dev->dev, "failed to construct LCDC encoder\n");
ret = PTR_ERR(plane); return PTR_ERR(encoder);
goto fail; }
}
priv->planes[priv->num_planes++] = plane;
/* /* LCDC can be hooked to DMA_P (TODO: Add DMA_S later?) */
* Setup the LCDC/LVDS path: RGB2 -> DMA_P -> LCDC -> LVDS: encoder->possible_crtcs = 1 << DMA_P;
*/
panel = detect_panel(dev); connector = mdp4_lvds_connector_init(dev, panel, encoder);
if (IS_ERR(panel)) { if (IS_ERR(connector)) {
ret = PTR_ERR(panel); dev_err(dev->dev, "failed to initialize LVDS connector\n");
dev_err(dev->dev, "failed to detect LVDS panel: %d\n", ret); return PTR_ERR(connector);
goto fail; }
}
plane = mdp4_plane_init(dev, RGB2, true); priv->encoders[priv->num_encoders++] = encoder;
if (IS_ERR(plane)) { priv->connectors[priv->num_connectors++] = connector;
dev_err(dev->dev, "failed to construct plane for RGB2\n");
ret = PTR_ERR(plane);
goto fail;
}
crtc = mdp4_crtc_init(dev, plane, priv->num_crtcs, 0, DMA_P); break;
if (IS_ERR(crtc)) { case DRM_MODE_ENCODER_TMDS:
dev_err(dev->dev, "failed to construct crtc for DMA_P\n"); encoder = mdp4_dtv_encoder_init(dev);
ret = PTR_ERR(crtc); if (IS_ERR(encoder)) {
goto fail; dev_err(dev->dev, "failed to construct DTV encoder\n");
} return PTR_ERR(encoder);
}
encoder = mdp4_lcdc_encoder_init(dev, panel); /* DTV can be hooked to DMA_E: */
if (IS_ERR(encoder)) { encoder->possible_crtcs = 1 << 1;
dev_err(dev->dev, "failed to construct LCDC encoder\n");
ret = PTR_ERR(encoder);
goto fail;
}
/* LCDC can be hooked to DMA_P: */ if (priv->hdmi) {
encoder->possible_crtcs = 1 << priv->num_crtcs; /* Construct bridge/connector for HDMI: */
ret = hdmi_modeset_init(priv->hdmi, dev, encoder);
if (ret) {
dev_err(dev->dev, "failed to initialize HDMI: %d\n", ret);
return ret;
}
}
priv->crtcs[priv->num_crtcs++] = crtc; priv->encoders[priv->num_encoders++] = encoder;
priv->encoders[priv->num_encoders++] = encoder;
connector = mdp4_lvds_connector_init(dev, panel, encoder); break;
if (IS_ERR(connector)) { default:
ret = PTR_ERR(connector); dev_err(dev->dev, "Invalid or unsupported interface\n");
dev_err(dev->dev, "failed to initialize LVDS connector: %d\n", ret); return -EINVAL;
goto fail;
} }
priv->connectors[priv->num_connectors++] = connector;
/* return 0;
* Setup DTV/HDMI path: RGB1 -> DMA_E -> DTV -> HDMI: }
*/
plane = mdp4_plane_init(dev, RGB1, true); static int modeset_init(struct mdp4_kms *mdp4_kms)
if (IS_ERR(plane)) { {
dev_err(dev->dev, "failed to construct plane for RGB1\n"); struct drm_device *dev = mdp4_kms->dev;
ret = PTR_ERR(plane); struct msm_drm_private *priv = dev->dev_private;
goto fail; struct drm_plane *plane;
} struct drm_crtc *crtc;
int i, ret;
static const enum mdp4_pipe rgb_planes[] = {
RGB1, RGB2,
};
static const enum mdp4_pipe vg_planes[] = {
VG1, VG2,
};
static const enum mdp4_dma mdp4_crtcs[] = {
DMA_P, DMA_E,
};
static const char * const mdp4_crtc_names[] = {
"DMA_P", "DMA_E",
};
static const int mdp4_intfs[] = {
DRM_MODE_ENCODER_LVDS,
DRM_MODE_ENCODER_TMDS,
};
crtc = mdp4_crtc_init(dev, plane, priv->num_crtcs, 1, DMA_E); /* construct non-private planes: */
if (IS_ERR(crtc)) { for (i = 0; i < ARRAY_SIZE(vg_planes); i++) {
dev_err(dev->dev, "failed to construct crtc for DMA_E\n"); plane = mdp4_plane_init(dev, vg_planes[i], false);
ret = PTR_ERR(crtc); if (IS_ERR(plane)) {
goto fail; dev_err(dev->dev,
"failed to construct plane for VG%d\n", i + 1);
ret = PTR_ERR(plane);
goto fail;
}
priv->planes[priv->num_planes++] = plane;
} }
encoder = mdp4_dtv_encoder_init(dev); for (i = 0; i < ARRAY_SIZE(mdp4_crtcs); i++) {
if (IS_ERR(encoder)) { plane = mdp4_plane_init(dev, rgb_planes[i], true);
dev_err(dev->dev, "failed to construct DTV encoder\n"); if (IS_ERR(plane)) {
ret = PTR_ERR(encoder); dev_err(dev->dev,
goto fail; "failed to construct plane for RGB%d\n", i + 1);
} ret = PTR_ERR(plane);
goto fail;
}
/* DTV can be hooked to DMA_E: */ crtc = mdp4_crtc_init(dev, plane, priv->num_crtcs, i,
encoder->possible_crtcs = 1 << priv->num_crtcs; mdp4_crtcs[i]);
if (IS_ERR(crtc)) {
dev_err(dev->dev, "failed to construct crtc for %s\n",
mdp4_crtc_names[i]);
ret = PTR_ERR(crtc);
goto fail;
}
priv->crtcs[priv->num_crtcs++] = crtc;
}
priv->crtcs[priv->num_crtcs++] = crtc; /*
priv->encoders[priv->num_encoders++] = encoder; * we currently set up two relatively fixed paths:
*
* LCDC/LVDS path: RGB1 -> DMA_P -> LCDC -> LVDS
* DTV/HDMI path: RGB2 -> DMA_E -> DTV -> HDMI
*/
if (priv->hdmi) { for (i = 0; i < ARRAY_SIZE(mdp4_intfs); i++) {
/* Construct bridge/connector for HDMI: */ ret = mdp4_modeset_init_intf(mdp4_kms, mdp4_intfs[i]);
ret = hdmi_modeset_init(priv->hdmi, dev, encoder);
if (ret) { if (ret) {
dev_err(dev->dev, "failed to initialize HDMI: %d\n", ret); dev_err(dev->dev, "failed to initialize intf: %d, %d\n",
i, ret);
goto fail; goto fail;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7