On Tue, Oct 11, 2022 at 04:49:40PM +0300, Jani Nikula wrote:
> 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().
All the function names around that stuff still make my head spin,
but hopefully it'll clear up eventually when all the cruft has
disappeared.
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_edid.c | 6 +++---
> drivers/gpu/drm/drm_probe_helper.c | 2 +-
> include/drm/drm_edid.h | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 1ada36e0d826..8baa46dc2537 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -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);
>
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 69b0b2b9cc1c..2fc21df709bc 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -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;
> }
> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
> index 429735b91f63..05380681a4fb 100644
> --- a/include/drm/drm_edid.h
> +++ b/include/drm/drm_edid.h
> @@ -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);
> --
> 2.34.1
--
Ville Syrjälä
Intel
