[Intel-gfx] [PATCH 2/8] drm/i915: Check has_infoframes when enabling infoframes

[Rodrigo Vivi]

On Fri, May 19, 2017 at 04:17:19PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> has_infoframe is what tells us whether infoframes should be enabled, so
> let's pass that instead of has_hdmi_sink to .set_infoframes().

makes sense

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>



> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c  | 6 +++---
>  drivers/gpu/drm/i915/intel_hdmi.c | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 0914ad96a71b..8ab0f34d8de9 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1673,7 +1673,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
>  }
>  
>  static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
> -				      bool has_hdmi_sink,
> +				      bool has_infoframe,
>  				      const struct intel_crtc_state *crtc_state,
>  				      const struct drm_connector_state *conn_state,
>  				      struct intel_shared_dpll *pll)
> @@ -1698,7 +1698,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
>  					INTEL_OUTPUT_HDMI);
>  
>  	intel_hdmi->set_infoframes(drm_encoder,
> -				   has_hdmi_sink,
> +				   has_infoframe,
>  				   crtc_state, conn_state);
>  }
>  
> @@ -1718,7 +1718,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,
>  	}
>  	if (type == INTEL_OUTPUT_HDMI) {
>  		intel_ddi_pre_enable_hdmi(encoder,
> -					  pipe_config->has_hdmi_sink,
> +					  pipe_config->has_infoframe,
>  					  pipe_config, conn_state,
>  					  pipe_config->shared_dpll);
>  	}
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 58d690393b29..b586d9782109 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1676,7 +1676,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder,
>  	intel_hdmi_prepare(encoder, pipe_config);
>  
>  	intel_hdmi->set_infoframes(&encoder->base,
> -				   pipe_config->has_hdmi_sink,
> +				   pipe_config->has_infoframe,
>  				   pipe_config, conn_state);
>  }
>  
> @@ -1696,7 +1696,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder,
>  				 0x2b247878);
>  
>  	intel_hdmi->set_infoframes(&encoder->base,
> -				   pipe_config->has_hdmi_sink,
> +				   pipe_config->has_infoframe,
>  				   pipe_config, conn_state);
>  
>  	g4x_enable_hdmi(encoder, pipe_config, conn_state);
> @@ -1768,7 +1768,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,
>  	chv_set_phy_signal_level(encoder, 128, 102, false);
>  
>  	intel_hdmi->set_infoframes(&encoder->base,
> -				   pipe_config->has_hdmi_sink,
> +				   pipe_config->has_infoframe,
>  				   pipe_config, conn_state);
>  
>  	g4x_enable_hdmi(encoder, pipe_config, conn_state);
> -- 
> 2.10.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx