[Intel-gfx] [PATCH v3] /drm/i915/hdmi: SCDC Scrambling enable without CTS mode

[Ville Syrjälä]

On Mon, Dec 10, 2018 at 02:52:54PM -0800, clinton.a.taylor at intel.com wrote:
> From: Clint Taylor <clinton.a.taylor at intel.com>
> 
> Setting the SCDC scrambling CTS mode causes HDMI Link Layer protocol tests
> HF1-12 and HF1-13 to fail.
> 
> V2: Removed "Source Shall" entries to a new patch
> V3: Rebase to drm-tip
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107895
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107896
> Signed-off-by: Clint Taylor <clinton.a.taylor at intel.com>

Thanks for the patch. Pushed to dinq.

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index f3e1d6a..92c0bf7 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1880,7 +1880,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
>  			temp |= TRANS_DDI_MODE_SELECT_DVI;
>  
>  		if (crtc_state->hdmi_scrambling)
> -			temp |= TRANS_DDI_HDMI_SCRAMBLING_MASK;
> +			temp |= TRANS_DDI_HDMI_SCRAMBLING;
>  		if (crtc_state->hdmi_high_tmds_clock_ratio)
>  			temp |= TRANS_DDI_HIGH_TMDS_CHAR_RATE;
>  	} else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) {
> @@ -3793,8 +3793,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
>  		if (intel_dig_port->infoframe_enabled(encoder, pipe_config))
>  			pipe_config->has_infoframe = true;
>  
> -		if ((temp & TRANS_DDI_HDMI_SCRAMBLING_MASK) ==
> -			TRANS_DDI_HDMI_SCRAMBLING_MASK)
> +		if (temp & TRANS_DDI_HDMI_SCRAMBLING)
>  			pipe_config->hdmi_scrambling = true;
>  		if (temp & TRANS_DDI_HIGH_TMDS_CHAR_RATE)
>  			pipe_config->hdmi_high_tmds_clock_ratio = true;
> -- 
> 1.9.1

-- 
Ville Syrjälä
Intel