Commit 3ce73840 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/bridge: remove drm_bridge_get_edid() in favour of drm_bridge_edid_read() 



All users of drm_bridge_get_edid() have been converted to use
drm_bridge_edid_read(). Remove drm_bridge_get_edid().

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/c51d50edddbe8816eaa63e6ccafa9f2354b506ba.1706038510.git.jani.nikula@intel.com
parent b334be86

drivers/gpu/drm/drm_bridge.c

+2 −26
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ EXPORT_SYMBOL_GPL(drm_bridge_get_modes); 
 * the EDID and return it. Otherwise return NULL.

 *

 * If &drm_bridge_funcs.edid_read is not set, fall back to using

 * drm_bridge_get_edid() and wrapping it in struct drm_edid.

 * &drm_bridge_funcs.get_edid and wrapping it in struct drm_edid.

 *

 * RETURNS:

 * The retrieved EDID on success, or NULL otherwise.
@@ -1233,7 +1233,7 @@ const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge, 
		const struct drm_edid *drm_edid;

		struct edid *edid;



		edid = drm_bridge_get_edid(bridge, connector);

		edid = bridge->funcs->get_edid(bridge, connector);

		if (!edid)

			return NULL;
@@ -1248,30 +1248,6 @@ const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge, 
}

EXPORT_SYMBOL_GPL(drm_bridge_edid_read);



/**

 * drm_bridge_get_edid - get the EDID data of the connected display

 * @bridge: bridge control structure

 * @connector: the connector to read EDID for

 *

 * If the bridge supports output EDID retrieval, as reported by the

 * DRM_BRIDGE_OP_EDID bridge ops flag, call &drm_bridge_funcs.get_edid to

 * get the EDID and return it. Otherwise return NULL.

 *

 * Deprecated. Prefer using drm_bridge_edid_read().

 *

 * RETURNS:

 * The retrieved EDID on success, or NULL otherwise.

 */

struct edid *drm_bridge_get_edid(struct drm_bridge *bridge,

				 struct drm_connector *connector)

{

	if (!(bridge->ops & DRM_BRIDGE_OP_EDID))

		return NULL;



	return bridge->funcs->get_edid(bridge, connector);

}

EXPORT_SYMBOL_GPL(drm_bridge_get_edid);



/**

 * drm_bridge_hpd_enable - enable hot plug detection for the bridge

 * @bridge: bridge control structure

include/drm/drm_bridge.h

+0 −2
Original line number Diff line number Diff line
@@ -921,8 +921,6 @@ int drm_bridge_get_modes(struct drm_bridge *bridge, 
			 struct drm_connector *connector);

const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,

					    struct drm_connector *connector);

struct edid *drm_bridge_get_edid(struct drm_bridge *bridge,

				 struct drm_connector *connector);

void drm_bridge_hpd_enable(struct drm_bridge *bridge,

			   void (*cb)(void *data,

				      enum drm_connector_status status),