Commit 46876af3 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/omap/hdmi5: switch to ->edid_read callback 



Prefer using the struct drm_edid based callback and functions.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/da96653c111a7f989c7c804923968fa5f47c6b5a.1706038510.git.jani.nikula@intel.com
parent 13a9e2be

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

+6 −6
Original line number Diff line number Diff line
@@ -425,11 +425,11 @@ static void hdmi5_bridge_disable(struct drm_bridge *bridge, 
	mutex_unlock(&hdmi->lock);

}



static struct edid *hdmi5_bridge_get_edid(struct drm_bridge *bridge,

static const struct drm_edid *hdmi5_bridge_edid_read(struct drm_bridge *bridge,

						     struct drm_connector *connector)

{

	struct omap_hdmi *hdmi = drm_bridge_to_hdmi(bridge);

	struct edid *edid;

	const struct drm_edid *drm_edid;

	bool need_enable;

	int idlemode;

	int r;
@@ -452,7 +452,7 @@ static struct edid *hdmi5_bridge_get_edid(struct drm_bridge *bridge, 


	hdmi5_core_ddc_init(&hdmi->core);



	edid = drm_do_get_edid(connector, hdmi5_core_ddc_read, &hdmi->core);

	drm_edid = drm_edid_read_custom(connector, hdmi5_core_ddc_read, &hdmi->core);



	hdmi5_core_ddc_uninit(&hdmi->core);
@@ -464,7 +464,7 @@ static struct edid *hdmi5_bridge_get_edid(struct drm_bridge *bridge, 
	if (need_enable)

		hdmi_core_disable(hdmi);



	return (struct edid *)edid;

	return drm_edid;

}



static const struct drm_bridge_funcs hdmi5_bridge_funcs = {
@@ -475,7 +475,7 @@ static const struct drm_bridge_funcs hdmi5_bridge_funcs = { 
	.atomic_reset = drm_atomic_helper_bridge_reset,

	.atomic_enable = hdmi5_bridge_enable,

	.atomic_disable = hdmi5_bridge_disable,

	.get_edid = hdmi5_bridge_get_edid,

	.edid_read = hdmi5_bridge_edid_read,

};



static void hdmi5_bridge_init(struct omap_hdmi *hdmi)