On Thu, 19 Jan 2023, Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
> Realize that drm_edid_connector_update() and
> _drm_connector_update_edid_property() are now the same thing. Drop the
> latter.
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Thanks for the reviews, pushed 1-4 to drm-misc-next.
BR,
Jani.
> ---
> drivers/gpu/drm/drm_edid.c | 21 +--------------------
> 1 file changed, 1 insertion(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index d0c21d27b978..3d0a4da661bc 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -6784,24 +6784,6 @@ int drm_edid_connector_add_modes(struct drm_connector *connector)
> }
> EXPORT_SYMBOL(drm_edid_connector_add_modes);
>
> -static int _drm_connector_update_edid_property(struct drm_connector *connector,
> - const struct drm_edid *drm_edid)
> -{
> - /*
> - * Set the display info, using edid if available, otherwise resetting
> - * the values to defaults. This duplicates the work done in
> - * drm_add_edid_modes, but that function is not consistently called
> - * before this one in all drivers and the computation is cheap enough
> - * that it seems better to duplicate it rather than attempt to ensure
> - * some arbitrary ordering of calls.
> - */
> - update_display_info(connector, drm_edid);
> -
> - _drm_update_tile_info(connector, drm_edid);
> -
> - return _drm_edid_connector_property_update(connector, drm_edid);
> -}
> -
> /**
> * drm_connector_update_edid_property - update the edid property of a connector
> * @connector: drm connector
> @@ -6823,8 +6805,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
> {
> struct drm_edid drm_edid;
>
> - return _drm_connector_update_edid_property(connector,
> - drm_edid_legacy_init(&drm_edid, edid));
> + return drm_edid_connector_update(connector, drm_edid_legacy_init(&drm_edid, edid));
> }
> EXPORT_SYMBOL(drm_connector_update_edid_property);
--
Jani Nikula, Intel Open Source Graphics Center
