Commit 1516d119 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: Simplify HDMI mode and infoframe configuration 



Remove the omap_connector_get_hdmi_mode() function as the HDMI mode can
be accessed directly from the connector's display info.

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-23-laurent.pinchart@ideasonboard.com
parent 2a0a3ae1

drivers/gpu/drm/omapdrm/omap_connector.c

+0 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct omap_connector { 
	struct drm_connector base;

	struct omap_dss_device *output;

	struct omap_dss_device *hpd;

	bool hdmi_mode;

};



static void omap_connector_hpd_notify(struct drm_connector *connector,
@@ -84,13 +83,6 @@ void omap_connector_disable_hpd(struct drm_connector *connector) 
		hpd->ops->unregister_hpd_cb(hpd);

}



bool omap_connector_get_hdmi_mode(struct drm_connector *connector)

{

	struct omap_connector *omap_connector = to_omap_connector(connector);



	return omap_connector->hdmi_mode;

}



static struct omap_dss_device *

omap_connector_find_device(struct drm_connector *connector,

			   enum omap_dss_device_ops_flag op)
@@ -167,7 +159,6 @@ static void omap_connector_destroy(struct drm_connector *connector) 
static int omap_connector_get_modes_edid(struct drm_connector *connector,

					 struct omap_dss_device *dssdev)

{

	struct omap_connector *omap_connector = to_omap_connector(connector);

	enum drm_connector_status status;

	void *edid;

	int n;
@@ -189,8 +180,6 @@ static int omap_connector_get_modes_edid(struct drm_connector *connector, 
	drm_connector_update_edid_property(connector, edid);

	n = drm_add_edid_modes(connector, edid);



	omap_connector->hdmi_mode = drm_detect_hdmi_monitor(edid);



	kfree(edid);

	return n;

drivers/gpu/drm/omapdrm/omap_connector.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct omap_dss_device; 
struct drm_connector *omap_connector_init(struct drm_device *dev,

					  struct omap_dss_device *output,

					  struct drm_encoder *encoder);

bool omap_connector_get_hdmi_mode(struct drm_connector *connector);

void omap_connector_enable_hpd(struct drm_connector *connector);

void omap_connector_disable_hpd(struct drm_connector *connector);

enum drm_mode_status omap_connector_mode_fixup(struct omap_dss_device *dssdev,

drivers/gpu/drm/omapdrm/omap_encoder.c

+1 −3
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ static void omap_encoder_hdmi_mode_set(struct drm_connector *connector, 
{

	struct omap_encoder *omap_encoder = to_omap_encoder(encoder);

	struct omap_dss_device *dssdev = omap_encoder->output;

	bool hdmi_mode;



	hdmi_mode = omap_connector_get_hdmi_mode(connector);

	bool hdmi_mode = connector->display_info.is_hdmi;



	if (dssdev->ops->hdmi.set_hdmi_mode)

		dssdev->ops->hdmi.set_hdmi_mode(dssdev, hdmi_mode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE