Commit 019b9387 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/edid: rename drm_add_override_edid_modes() to drm_edid_override_connector_update() 



Follow the naming of both EDID override functions as well as
drm_edid_connector_update(). This also matches better what the function
does; a combination of EDID property update and add modes. Indeed it
should later be converted to call drm_edid_connector_update().

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ba12957e0488654e8db010a3ff1534079caec972.1666614699.git.jani.nikula@intel.com
parent 91ec9ab4

drivers/gpu/drm/drm_edid.c

+3 −3
Original line number Diff line number Diff line
@@ -2227,7 +2227,7 @@ int drm_edid_override_reset(struct drm_connector *connector) 
}



/**

 * drm_add_override_edid_modes - add modes from override/firmware EDID

 * drm_edid_override_connector_update - add modes from override/firmware EDID

 * @connector: connector we're probing

 *

 * Add modes from the override/firmware EDID, if available. Only to be used from
@@ -2237,7 +2237,7 @@ int drm_edid_override_reset(struct drm_connector *connector) 
 *

 * Return: The number of modes added or 0 if we couldn't find any.

 */

int drm_add_override_edid_modes(struct drm_connector *connector)

int drm_edid_override_connector_update(struct drm_connector *connector)

{

	struct edid *override;

	int num_modes = 0;
@@ -2254,7 +2254,7 @@ int drm_add_override_edid_modes(struct drm_connector *connector) 


	return num_modes;

}

EXPORT_SYMBOL(drm_add_override_edid_modes);

EXPORT_SYMBOL(drm_edid_override_connector_update);



typedef int read_block_fn(void *context, u8 *buf, unsigned int block, size_t len);

drivers/gpu/drm/drm_probe_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int drm_helper_probe_get_modes(struct drm_connector *connector) 
	 * override/firmware EDID.

	 */

	if (count == 0 && connector->status == connector_status_connected)

		count = drm_add_override_edid_modes(connector);

		count = drm_edid_override_connector_update(connector);



	return count;

}

include/drm/drm_edid.h

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, 
				     struct i2c_adapter *adapter);

struct edid *drm_edid_duplicate(const struct edid *edid);

int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);

int drm_add_override_edid_modes(struct drm_connector *connector);

int drm_edid_override_connector_update(struct drm_connector *connector);



u8 drm_match_cea_mode(const struct drm_display_mode *to_match);

bool drm_detect_hdmi_monitor(const struct edid *edid);