Skip to content

Commit 019b938

Browse files
committed
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: Jani Nikula <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/ba12957e0488654e8db010a3ff1534079caec972.1666614699.git.jani.nikula@intel.com
1 parent 91ec9ab commit 019b938

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

drivers/gpu/drm/drm_edid.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,7 @@ int drm_edid_override_reset(struct drm_connector *connector)
22272227
}
22282228

22292229
/**
2230-
* drm_add_override_edid_modes - add modes from override/firmware EDID
2230+
* drm_edid_override_connector_update - add modes from override/firmware EDID
22312231
* @connector: connector we're probing
22322232
*
22332233
* 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)
22372237
*
22382238
* Return: The number of modes added or 0 if we couldn't find any.
22392239
*/
2240-
int drm_add_override_edid_modes(struct drm_connector *connector)
2240+
int drm_edid_override_connector_update(struct drm_connector *connector)
22412241
{
22422242
struct edid *override;
22432243
int num_modes = 0;
@@ -2254,7 +2254,7 @@ int drm_add_override_edid_modes(struct drm_connector *connector)
22542254

22552255
return num_modes;
22562256
}
2257-
EXPORT_SYMBOL(drm_add_override_edid_modes);
2257+
EXPORT_SYMBOL(drm_edid_override_connector_update);
22582258

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

drivers/gpu/drm/drm_probe_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ static int drm_helper_probe_get_modes(struct drm_connector *connector)
367367
* override/firmware EDID.
368368
*/
369369
if (count == 0 && connector->status == connector_status_connected)
370-
count = drm_add_override_edid_modes(connector);
370+
count = drm_edid_override_connector_update(connector);
371371

372372
return count;
373373
}

include/drm/drm_edid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
577577
struct i2c_adapter *adapter);
578578
struct edid *drm_edid_duplicate(const struct edid *edid);
579579
int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
580-
int drm_add_override_edid_modes(struct drm_connector *connector);
580+
int drm_edid_override_connector_update(struct drm_connector *connector);
581581

582582
u8 drm_match_cea_mode(const struct drm_display_mode *to_match);
583583
bool drm_detect_hdmi_monitor(const struct edid *edid);

0 commit comments

Comments
 (0)