Commit 514fc910 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: Factor out display type to connector type conversion 



Move the code that computes the DRM connector type for the
omapdss_device display type to a new omapdss_device_connector_type()
function for later reuse.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226112514.12455-24-laurent.pinchart@ideasonboard.com
parent 1516d119

drivers/gpu/drm/omapdrm/dss/base.c

+23 −0
Original line number Diff line number Diff line
@@ -285,6 +285,29 @@ void omapdss_device_post_disable(struct omap_dss_device *dssdev) 
}

EXPORT_SYMBOL_GPL(omapdss_device_post_disable);



unsigned int omapdss_device_connector_type(enum omap_display_type type)

{

	switch (type) {

	case OMAP_DISPLAY_TYPE_HDMI:

		return DRM_MODE_CONNECTOR_HDMIA;

	case OMAP_DISPLAY_TYPE_DVI:

		return DRM_MODE_CONNECTOR_DVID;

	case OMAP_DISPLAY_TYPE_DSI:

		return DRM_MODE_CONNECTOR_DSI;

	case OMAP_DISPLAY_TYPE_DPI:

	case OMAP_DISPLAY_TYPE_DBI:

		return DRM_MODE_CONNECTOR_DPI;

	case OMAP_DISPLAY_TYPE_VENC:

		/* TODO: This could also be composite */

		return DRM_MODE_CONNECTOR_SVIDEO;

	case OMAP_DISPLAY_TYPE_SDI:

		return DRM_MODE_CONNECTOR_LVDS;

	default:

		return DRM_MODE_CONNECTOR_Unknown;

	}

}

EXPORT_SYMBOL_GPL(omapdss_device_connector_type);



/* -----------------------------------------------------------------------------

 * Components Handling

 */

drivers/gpu/drm/omapdrm/dss/omapdss.h

+1 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ void omapdss_device_pre_enable(struct omap_dss_device *dssdev); 
void omapdss_device_enable(struct omap_dss_device *dssdev);

void omapdss_device_disable(struct omap_dss_device *dssdev);

void omapdss_device_post_disable(struct omap_dss_device *dssdev);

unsigned int omapdss_device_connector_type(enum omap_display_type type);



int omap_dss_get_num_overlay_managers(void);

drivers/gpu/drm/omapdrm/omap_connector.c

+1 −18
Original line number Diff line number Diff line
@@ -296,24 +296,7 @@ static int omap_connector_get_type(struct omap_dss_device *output) 
	type = display->type;

	omapdss_device_put(display);



	switch (type) {

	case OMAP_DISPLAY_TYPE_HDMI:

		return DRM_MODE_CONNECTOR_HDMIA;

	case OMAP_DISPLAY_TYPE_DVI:

		return DRM_MODE_CONNECTOR_DVID;

	case OMAP_DISPLAY_TYPE_DSI:

		return DRM_MODE_CONNECTOR_DSI;

	case OMAP_DISPLAY_TYPE_DPI:

	case OMAP_DISPLAY_TYPE_DBI:

		return DRM_MODE_CONNECTOR_DPI;

	case OMAP_DISPLAY_TYPE_VENC:

		/* TODO: This could also be composite */

		return DRM_MODE_CONNECTOR_SVIDEO;

	case OMAP_DISPLAY_TYPE_SDI:

		return DRM_MODE_CONNECTOR_LVDS;

	default:

		return DRM_MODE_CONNECTOR_Unknown;

	}

	return omapdss_device_connector_type(type);

}



/* initialize connector */

CRA Git | Maintained and supported by SUSTech CRA and CCSE