Commit 7b90330f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/bridge: tfp410: use drm_bridge_edid_read() 



Prefer using the struct drm_edid based functions.

Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Robert Foss <rfoss@kernel.org>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
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/f857bb36a78c57dc6a07b7b6cc90312fc3139ca8.1706038510.git.jani.nikula@intel.com
parent 400bb4ee

drivers/gpu/drm/bridge/ti-tfp410.c

+8 −8
Original line number Diff line number Diff line
@@ -50,18 +50,18 @@ drm_connector_to_tfp410(struct drm_connector *connector) 
static int tfp410_get_modes(struct drm_connector *connector)

{

	struct tfp410 *dvi = drm_connector_to_tfp410(connector);

	struct edid *edid;

	const struct drm_edid *drm_edid;

	int ret;



	if (dvi->next_bridge->ops & DRM_BRIDGE_OP_EDID) {

		edid = drm_bridge_get_edid(dvi->next_bridge, connector);

		if (!edid)

		drm_edid = drm_bridge_edid_read(dvi->next_bridge, connector);

		if (!drm_edid)

			DRM_INFO("EDID read failed. Fallback to standard modes\n");

	} else {

		edid = NULL;

		drm_edid = NULL;

	}



	if (!edid) {

	if (!drm_edid) {

		/*

		 * No EDID, fallback on the XGA standard modes and prefer a mode

		 * pretty much anything can handle.
@@ -71,11 +71,11 @@ static int tfp410_get_modes(struct drm_connector *connector) 
		return ret;

	}



	drm_connector_update_edid_property(connector, edid);

	drm_edid_connector_update(connector, drm_edid);



	ret = drm_add_edid_modes(connector, edid);

	ret = drm_edid_connector_add_modes(connector);



	kfree(edid);

	drm_edid_free(drm_edid);



	return ret;

}