aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 03771f818eaa..5f98506ac2c5 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -129,28 +129,6 @@ static const struct drm_mode_config_funcs omap_mode_config_funcs = {
129 .atomic_commit = drm_atomic_helper_commit, 129 .atomic_commit = drm_atomic_helper_commit,
130}; 130};
131 131
132static int get_connector_type(struct omap_dss_device *display)
133{
134 switch (display->type) {
135 case OMAP_DISPLAY_TYPE_HDMI:
136 return DRM_MODE_CONNECTOR_HDMIA;
137 case OMAP_DISPLAY_TYPE_DVI:
138 return DRM_MODE_CONNECTOR_DVID;
139 case OMAP_DISPLAY_TYPE_DSI:
140 return DRM_MODE_CONNECTOR_DSI;
141 case OMAP_DISPLAY_TYPE_DPI:
142 case OMAP_DISPLAY_TYPE_DBI:
143 return DRM_MODE_CONNECTOR_DPI;
144 case OMAP_DISPLAY_TYPE_VENC:
145 /* TODO: This could also be composite */
146 return DRM_MODE_CONNECTOR_SVIDEO;
147 case OMAP_DISPLAY_TYPE_SDI:
148 return DRM_MODE_CONNECTOR_LVDS;
149 default:
150 return DRM_MODE_CONNECTOR_Unknown;
151 }
152}
153
154static void omap_disconnect_pipelines(struct drm_device *ddev) 132static void omap_disconnect_pipelines(struct drm_device *ddev)
155{ 133{
156 struct omap_drm_private *priv = ddev->dev_private; 134 struct omap_drm_private *priv = ddev->dev_private;
@@ -322,9 +300,8 @@ static int omap_modeset_init(struct drm_device *dev)
322 if (!encoder) 300 if (!encoder)
323 return -ENOMEM; 301 return -ENOMEM;
324 302
325 connector = omap_connector_init(dev, 303 connector = omap_connector_init(dev, pipe->output, display,
326 get_connector_type(display), pipe->output, 304 encoder);
327 display, encoder);
328 if (!connector) 305 if (!connector)
329 return -ENOMEM; 306 return -ENOMEM;
330 307