Commit 52c5dd2a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: Determine connector type directly in omap_connector.c 



Instead of determining the connector type from the type of the display's
omap_dss_device and passing it to the omap_connector_init() function,
move the type determination code to omap_connector.c and remove the type
argument to the connector init function. This moves code to a more
natural location, making the driver easier to read.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 47a3ee27

drivers/gpu/drm/omapdrm/omap_connector.c

+26 −3
Original line number Diff line number Diff line
@@ -325,10 +325,33 @@ static const struct drm_connector_helper_funcs omap_connector_helper_funcs = { 
	.mode_valid = omap_connector_mode_valid,

};



static int omap_connector_get_type(struct omap_dss_device *display)

{

	switch (display->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;

	}

}



/* initialize connector */

struct drm_connector *omap_connector_init(struct drm_device *dev,

		int connector_type, struct omap_dss_device *output,

		struct omap_dss_device *display, struct drm_encoder *encoder)

					  struct omap_dss_device *output,

					  struct omap_dss_device *display,

					  struct drm_encoder *encoder)

{

	struct drm_connector *connector = NULL;

	struct omap_connector *omap_connector;
@@ -348,7 +371,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev, 
	connector->doublescan_allowed = 0;



	drm_connector_init(dev, connector, &omap_connector_funcs,

				connector_type);

			   omap_connector_get_type(display));

	drm_connector_helper_add(connector, &omap_connector_helper_funcs);



	/*

drivers/gpu/drm/omapdrm/omap_connector.h

+3 −2
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ struct drm_encoder; 
struct omap_dss_device;



struct drm_connector *omap_connector_init(struct drm_device *dev,

		int connector_type, struct omap_dss_device *output,

		struct omap_dss_device *display, struct drm_encoder *encoder);

					  struct omap_dss_device *output,

					  struct omap_dss_device *display,

					  struct drm_encoder *encoder);

struct drm_encoder *omap_connector_attached_encoder(

		struct drm_connector *connector);

bool omap_connector_get_hdmi_mode(struct drm_connector *connector);

drivers/gpu/drm/omapdrm/omap_drv.c

+2 −25
Original line number Diff line number Diff line
@@ -129,28 +129,6 @@ static const struct drm_mode_config_funcs omap_mode_config_funcs = { 
	.atomic_commit = drm_atomic_helper_commit,

};



static int get_connector_type(struct omap_dss_device *display)

{

	switch (display->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;

	}

}



static void omap_disconnect_pipelines(struct drm_device *ddev)

{

	struct omap_drm_private *priv = ddev->dev_private;
@@ -322,9 +300,8 @@ static int omap_modeset_init(struct drm_device *dev) 
		if (!encoder)

			return -ENOMEM;



		connector = omap_connector_init(dev,

				get_connector_type(display), pipe->output,

				display, encoder);

		connector = omap_connector_init(dev, pipe->output, display,

						encoder);

		if (!connector)

			return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE