diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-01-17 16:29:24 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-01-21 10:51:25 +0200 |
| commit | 01a60883af043fe0f28863385511895313efd101 (patch) | |
| tree | 6650e52be54bdbe5a106ebce79d46c92010de701 /drivers/gpu/drm/i915 | |
| parent | 605a18722c7cb30b7e2ddec211c0394359740f5d (diff) | |
| download | linux-01a60883af043fe0f28863385511895313efd101.tar.gz | |
drm/i915/bios: intel_bios_hdmi_boost_level()
Don't access i915->vbt.ddi_port_info[] directly.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6d61a5bc60c995d2ee812ef61d3c5c93b61453e7.1579270868.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bios.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bios.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 88b78eae8bb2..5882ffc1b2a6 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2585,3 +2585,10 @@ int intel_bios_dp_boost_level(struct intel_encoder *encoder) return i915->vbt.ddi_port_info[encoder->port].dp_boost_level; } + +int intel_bios_hdmi_boost_level(struct intel_encoder *encoder) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + + return i915->vbt.ddi_port_info[encoder->port].hdmi_boost_level; +} diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h index 5e68c58b58ca..b1c11b9bea41 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.h +++ b/drivers/gpu/drm/i915/display/intel_bios.h @@ -250,5 +250,6 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder, int intel_bios_max_tmds_clock(struct intel_encoder *encoder); int intel_bios_hdmi_level_shift(struct intel_encoder *encoder); int intel_bios_dp_boost_level(struct intel_encoder *encoder); +int intel_bios_hdmi_boost_level(struct intel_encoder *encoder); #endif /* _INTEL_BIOS_H_ */ diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 7bd5858b1f4a..3697fa047362 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1055,8 +1055,7 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, level = n_entries - 1; /* If we're boosting the current, set bit 31 of trans1 */ - if (IS_GEN9_BC(dev_priv) && - dev_priv->vbt.ddi_port_info[port].hdmi_boost_level) + if (IS_GEN9_BC(dev_priv) && intel_bios_hdmi_boost_level(encoder)) iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE; /* Entry 9 is for HDMI: */ @@ -2341,7 +2340,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, u8 iboost; if (type == INTEL_OUTPUT_HDMI) - iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level; + iboost = intel_bios_hdmi_boost_level(encoder); else iboost = intel_bios_dp_boost_level(encoder); |