Re: [Intel-gfx] [PATCH v7 18/22] drm/edid: remove redundant _drm_connector_update_edid_property()

[Ville Syrjälä]

On Wed, Jan 04, 2023 at 12:05:33PM +0200, Jani Nikula 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ä 
> Signed-off-by: Jani Nikula 

Reviewed-by: Ville Syrjälä 

> ---
>  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 a64c0807e97f..ae50f533fea3 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -6810,24 +6810,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
> @@ -6849,8 +6831,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(_edid, edid));
> + return drm_edid_connector_update(connector, 
> drm_edid_legacy_init(_edid, edid));
>  }
>  EXPORT_SYMBOL(drm_connector_update_edid_property);
>  
> -- 
> 2.34.1

-- 
Ville Syrjälä
Intel

[Intel-gfx] [PATCH v7 18/22] drm/edid: remove redundant _drm_connector_update_edid_property()

[Jani Nikula]

Realize that drm_edid_connector_update() and
_drm_connector_update_edid_property() are now the same thing. Drop the
latter.

Cc: Ville Syrjälä 
Signed-off-by: Jani Nikula 
---
 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 a64c0807e97f..ae50f533fea3 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -6810,24 +6810,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
@@ -6849,8 +6831,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(_edid, edid));
+   return drm_edid_connector_update(connector, 
drm_edid_legacy_init(_edid, edid));
 }
 EXPORT_SYMBOL(drm_connector_update_edid_property);
 
-- 
2.34.1