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

drm/omap: hdmi: Remove omap_dss_device operations 



Now that the HDMI outputs are driven fully through the drm_bridge API
their omap_dss_device operations are not used anymore. Remove them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
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-42-laurent.pinchart@ideasonboard.com
parent 75fb968b

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

+0 −1
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ struct omap_hdmi { 
	bool display_enabled;

};



#define dssdev_to_hdmi(dssdev) container_of(dssdev, struct omap_hdmi, output)

#define drm_bridge_to_hdmi(b) container_of(b, struct omap_hdmi, bridge)



#endif

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

+0 −18
Original line number Diff line number Diff line
@@ -309,18 +309,6 @@ void hdmi4_core_disable(struct hdmi_core_data *core) 
	mutex_unlock(&hdmi->lock);

}



static int hdmi_connect(struct omap_dss_device *src,

			struct omap_dss_device *dst)

{

	return omapdss_device_connect(dst->dss, dst, dst->next);

}



static void hdmi_disconnect(struct omap_dss_device *src,

			    struct omap_dss_device *dst)

{

	omapdss_device_disconnect(dst, dst->next);

}



static struct edid *

hdmi_do_read_edid(struct omap_hdmi *hdmi,

		  struct edid *(*read)(struct omap_hdmi *hdmi,
@@ -370,11 +358,6 @@ done: 
	return edid;

}



static const struct omap_dss_device_ops hdmi_ops = {

	.connect		= hdmi_connect,

	.disconnect		= hdmi_disconnect,

};



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

 * DRM Bridge Operations

 */
@@ -741,7 +724,6 @@ static int hdmi4_init_output(struct omap_hdmi *hdmi) 
	out->type = OMAP_DISPLAY_TYPE_HDMI;

	out->name = "hdmi.0";

	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;

	out->ops = &hdmi_ops;

	out->owner = THIS_MODULE;

	out->of_port = 0;

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

+0 −18
Original line number Diff line number Diff line
@@ -307,18 +307,6 @@ static void hdmi_core_disable(struct omap_hdmi *hdmi) 
	mutex_unlock(&hdmi->lock);

}



static int hdmi_connect(struct omap_dss_device *src,

			struct omap_dss_device *dst)

{

	return omapdss_device_connect(dst->dss, dst, dst->next);

}



static void hdmi_disconnect(struct omap_dss_device *src,

			    struct omap_dss_device *dst)

{

	omapdss_device_disconnect(dst, dst->next);

}



static struct edid *

hdmi_do_read_edid(struct omap_hdmi *hdmi,

		  struct edid *(*read)(struct omap_hdmi *hdmi,
@@ -363,11 +351,6 @@ hdmi_do_read_edid(struct omap_hdmi *hdmi, 
	return (struct edid *)edid;

}



static const struct omap_dss_device_ops hdmi_ops = {

	.connect		= hdmi_connect,

	.disconnect		= hdmi_disconnect,

};



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

 * DRM Bridge Operations

 */
@@ -715,7 +698,6 @@ static int hdmi5_init_output(struct omap_hdmi *hdmi) 
	out->type = OMAP_DISPLAY_TYPE_HDMI;

	out->name = "hdmi.0";

	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;

	out->ops = &hdmi_ops;

	out->owner = THIS_MODULE;

	out->of_port = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE