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

drm/omap: dss: Remove .set_hdmi_mode() and .set_infoframe() operations 



The omapdss_hdmi_ops .set_hdmi_mode() and .set_infoframe() operations
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-37-laurent.pinchart@ideasonboard.com
parent 6886b346

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

+0 −3
Original line number Diff line number Diff line
@@ -287,9 +287,6 @@ struct omap_dss_writeback_info { 


struct omapdss_hdmi_ops {

	void (*lost_hotplug)(struct omap_dss_device *dssdev);

	int (*set_hdmi_mode)(struct omap_dss_device *dssdev, bool hdmi_mode);

	int (*set_infoframe)(struct omap_dss_device *dssdev,

		const struct hdmi_avi_infoframe *avi);

};



struct omapdss_dsi_ops {

drivers/gpu/drm/omapdrm/omap_encoder.c

+0 −26
Original line number Diff line number Diff line
@@ -69,28 +69,6 @@ static void omap_encoder_update_videomode_flags(struct videomode *vm, 
	}

}



static void omap_encoder_hdmi_mode_set(struct drm_connector *connector,

				       struct drm_encoder *encoder,

				       struct drm_display_mode *adjusted_mode)

{

	struct omap_encoder *omap_encoder = to_omap_encoder(encoder);

	struct omap_dss_device *dssdev = omap_encoder->output;

	bool hdmi_mode = connector->display_info.is_hdmi;



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

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



	if (hdmi_mode && dssdev->ops && dssdev->ops->hdmi.set_infoframe) {

		struct hdmi_avi_infoframe avi;

		int r;



		r = drm_hdmi_avi_infoframe_from_display_mode(&avi, connector,

							     adjusted_mode);

		if (r == 0)

			dssdev->ops->hdmi.set_infoframe(dssdev, &avi);

	}

}



static void omap_encoder_mode_set(struct drm_encoder *encoder,

				  struct drm_display_mode *mode,

				  struct drm_display_mode *adjusted_mode)
@@ -142,10 +120,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, 
		if (dssdev->ops && dssdev->ops->set_timings)

			dssdev->ops->set_timings(dssdev, adjusted_mode);

	}



	/* Set the HDMI mode and HDMI infoframe if applicable. */

	if (output->type == OMAP_DISPLAY_TYPE_HDMI)

		omap_encoder_hdmi_mode_set(connector, encoder, adjusted_mode);

}



static void omap_encoder_disable(struct drm_encoder *encoder)

CRA Git | Maintained and supported by SUSTech CRA and CCSE