On Wed, 23 Mar 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Rename intel_panel_vbt_fixed_mode() to
> intel_panel_vbt_lfp_fixed_mode() to be more descriptive.
> We'll have another VBT fixed mode function soon and we
> don't want to confuse the two.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Never really been thrilled about the lfp acronym, but *shrug*.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
> drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/display/intel_lvds.c | 2 +-
> drivers/gpu/drm/i915/display/intel_panel.c | 2 +-
> drivers/gpu/drm/i915/display/intel_panel.h | 2 +-
> drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index b4fda29b04b5..44f4c65522b9 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -2050,7 +2050,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
> intel_connector_attach_encoder(intel_connector, encoder);
>
> mutex_lock(&dev->mode_config.mutex);
> - fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
> + fixed_mode = intel_panel_vbt_lfp_fixed_mode(intel_connector);
> mutex_unlock(&dev->mode_config.mutex);
>
> if (!fixed_mode) {
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index d62123b9d0d3..e882a04a4cb1 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5055,7 +5055,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
>
> /* fallback to VBT if available for eDP */
> if (!fixed_mode)
> - fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
> + fixed_mode = intel_panel_vbt_lfp_fixed_mode(intel_connector);
> mutex_unlock(&dev->mode_config.mutex);
>
> if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
> index d068e0607153..c3f017c3740c 100644
> --- a/drivers/gpu/drm/i915/display/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/display/intel_lvds.c
> @@ -974,7 +974,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> goto out;
>
> /* Failed to get EDID, what about VBT? */
> - fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
> + fixed_mode = intel_panel_vbt_lfp_fixed_mode(intel_connector);
> if (fixed_mode)
> goto out;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
> index 2ba51222d156..bd606d0b1c24 100644
> --- a/drivers/gpu/drm/i915/display/intel_panel.c
> +++ b/drivers/gpu/drm/i915/display/intel_panel.c
> @@ -246,7 +246,7 @@ intel_panel_edid_fixed_mode(struct intel_connector *connector)
> }
>
> struct drm_display_mode *
> -intel_panel_vbt_fixed_mode(struct intel_connector *connector)
> +intel_panel_vbt_lfp_fixed_mode(struct intel_connector *connector)
> {
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct drm_display_info *info = &connector->base.display_info;
> diff --git a/drivers/gpu/drm/i915/display/intel_panel.h b/drivers/gpu/drm/i915/display/intel_panel.h
> index 579200270825..9704ac81fe3e 100644
> --- a/drivers/gpu/drm/i915/display/intel_panel.h
> +++ b/drivers/gpu/drm/i915/display/intel_panel.h
> @@ -47,6 +47,6 @@ intel_panel_edid_downclock_mode(struct intel_connector *connector,
> struct drm_display_mode *
> intel_panel_edid_fixed_mode(struct intel_connector *connector);
> struct drm_display_mode *
> -intel_panel_vbt_fixed_mode(struct intel_connector *connector);
> +intel_panel_vbt_lfp_fixed_mode(struct intel_connector *connector);
>
> #endif /* __INTEL_PANEL_H__ */
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index da0af425ed94..dc43cb8ecb86 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -1980,7 +1980,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
> intel_connector_attach_encoder(intel_connector, intel_encoder);
>
> mutex_lock(&dev->mode_config.mutex);
> - fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
> + fixed_mode = intel_panel_vbt_lfp_fixed_mode(intel_connector);
> mutex_unlock(&dev->mode_config.mutex);
>
> if (!fixed_mode) {
--
Jani Nikula, Intel Open Source Graphics Center
