[Intel-gfx] [PATCH 8/9] drm/i915/display: refer to vbt info as vbt_port_info

[Jani Nikula]

On Mon, 23 Dec 2019, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
> Now that we maintain our static port info, rename the places that refer
> to the port_info from vbt to use the vbt prefix. This is just a
> preparation step for a following change in which we will use the
> port_info variable name.

Side note, I intend to get rid of dev_priv->vbt.ddi_port_info[]
entirely.

For output initialization time, you'd have to call some function in
intel_bios.c to get the info you want. Maybe at that point you'd get an
opaque pointer to struct display_device_data which you could use to
query the child device data. You'd stick that pointer to intel_encoder
(or intel_connector), and subsequent queries would be based on that,
instead of figuring out the port and indexing something in dev_priv.

In the mean time, the rename for now seems fine.


BR,
Jani.


>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 1bdf63845472..a1b7075ea6be 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -902,7 +902,8 @@ icl_get_combo_buf_trans(struct drm_i915_private *dev_priv, int type, int rate,
>  
>  static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port)
>  {
> -	struct ddi_vbt_port_info *port_info = &dev_priv->vbt.ddi_port_info[port];
> +	struct ddi_vbt_port_info *vbt_port_info =
> +		&dev_priv->vbt.ddi_port_info[port];
>  	int n_entries, level, default_entry;
>  	enum phy phy = intel_port_to_phy(dev_priv, port);
>  
> @@ -943,8 +944,8 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por
>  	if (WARN_ON_ONCE(n_entries == 0))
>  		return 0;
>  
> -	if (port_info->hdmi_level_shift_set)
> -		level = port_info->hdmi_level_shift;
> +	if (vbt_port_info->hdmi_level_shift_set)
> +		level = vbt_port_info->hdmi_level_shift;
>  	else
>  		level = default_entry;
>  
> @@ -4783,15 +4784,15 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port)
>  
>  void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
>  {
> -	struct ddi_vbt_port_info *port_info =
> +	struct ddi_vbt_port_info *vbt_port_info =
>  		&dev_priv->vbt.ddi_port_info[port];
>  	struct intel_digital_port *intel_dig_port;
>  	struct intel_encoder *encoder;
>  	bool init_hdmi, init_dp, init_lspcon = false;
>  	enum phy phy = intel_port_to_phy(dev_priv, port);
>  
> -	init_hdmi = port_info->supports_dvi || port_info->supports_hdmi;
> -	init_dp = port_info->supports_dp;
> +	init_hdmi = vbt_port_info->supports_dvi || vbt_port_info->supports_hdmi;
> +	init_dp = vbt_port_info->supports_dp;
>  
>  	if (intel_bios_is_lspcon_present(dev_priv, port)) {
>  		/*
> @@ -4852,8 +4853,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
>  	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
>  
>  	if (intel_phy_is_tc(dev_priv, phy)) {
> -		bool is_legacy = !port_info->supports_typec_usb &&
> -				 !port_info->supports_tbt;
> +		bool is_legacy = !vbt_port_info->supports_typec_usb &&
> +				 !vbt_port_info->supports_tbt;
>  
>  		intel_tc_port_init(intel_dig_port, is_legacy);

-- 
Jani Nikula, Intel Open Source Graphics Center