mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-13 12:06:49 +00:00
drm/i915: Pass the level to intel_prepare_hdmi_ddi_buffers()
The caller of intel_prepare_hdmi_ddi_buffers() alreday figured out the level, so let's just pass it in instead if figuring it out again. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171016145705.11780-5-ville.syrjala@linux.intel.com Reviewed-by: James Ausmus <james.ausmus@intel.com>
This commit is contained in:
parent
081dfcfafc
commit
7ea79333a7
1 changed files with 4 additions and 5 deletions
|
@ -817,16 +817,15 @@ static void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder)
|
||||||
* values in advance. This function programs the correct values for
|
* values in advance. This function programs the correct values for
|
||||||
* HDMI/DVI use cases.
|
* HDMI/DVI use cases.
|
||||||
*/
|
*/
|
||||||
static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder)
|
static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder,
|
||||||
|
int hdmi_level)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||||
u32 iboost_bit = 0;
|
u32 iboost_bit = 0;
|
||||||
int n_hdmi_entries, hdmi_level;
|
int n_hdmi_entries;
|
||||||
enum port port = intel_ddi_get_encoder_port(encoder);
|
enum port port = intel_ddi_get_encoder_port(encoder);
|
||||||
const struct ddi_buf_trans *ddi_translations_hdmi;
|
const struct ddi_buf_trans *ddi_translations_hdmi;
|
||||||
|
|
||||||
hdmi_level = intel_ddi_hdmi_level(dev_priv, port);
|
|
||||||
|
|
||||||
ddi_translations_hdmi = intel_ddi_get_buf_trans_hdmi(dev_priv, &n_hdmi_entries);
|
ddi_translations_hdmi = intel_ddi_get_buf_trans_hdmi(dev_priv, &n_hdmi_entries);
|
||||||
|
|
||||||
/* If we're boosting the current, set bit 31 of trans1 */
|
/* If we're boosting the current, set bit 31 of trans1 */
|
||||||
|
@ -2202,7 +2201,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
|
||||||
bxt_ddi_vswing_sequence(dev_priv, level, port,
|
bxt_ddi_vswing_sequence(dev_priv, level, port,
|
||||||
INTEL_OUTPUT_HDMI);
|
INTEL_OUTPUT_HDMI);
|
||||||
else
|
else
|
||||||
intel_prepare_hdmi_ddi_buffers(encoder);
|
intel_prepare_hdmi_ddi_buffers(encoder, level);
|
||||||
|
|
||||||
if (IS_GEN9_BC(dev_priv))
|
if (IS_GEN9_BC(dev_priv))
|
||||||
skl_ddi_set_iboost(encoder, level, INTEL_OUTPUT_HDMI);
|
skl_ddi_set_iboost(encoder, level, INTEL_OUTPUT_HDMI);
|
||||||
|
|
Loading…
Reference in a new issue