[Intel-gfx] [PATCH v2] drm/i915: Fix HW readout for crtc_clock in HDMI mode

[Ville Syrjälä]

On Thu, Aug 08, 2019 at 07:25:47PM +0300, Imre Deak wrote:
> The conversion during HDMI HW readout from port_clock to crtc_clock was
> missed when HDMI 10bpc support was added, so fix that.
> 
> v2:
> - Unscrew the non-HDMI case.
> 
> Fixes: cd9e11a8bf25 ("drm/i915/icl: Add 10-bit support for hdmi")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109593
> Cc: Radhakrishna Sripada <radhakrishna.sripada at intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c           | 4 ++--
>  drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index aa5b2440513c..7c73d1f974fc 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -1467,8 +1467,8 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)
>  	else if (intel_crtc_has_dp_encoder(pipe_config))
>  		dotclock = intel_dotclock_calculate(pipe_config->port_clock,
>  						    &pipe_config->dp_m_n);
> -	else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp == 36)
> -		dotclock = pipe_config->port_clock * 2 / 3;
> +	else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp > 24)
> +		dotclock = pipe_config->port_clock * 24 / pipe_config->pipe_bpp;
>  	else
>  		dotclock = pipe_config->port_clock;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index a88ec9aa9ca0..21cb7ee34d45 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -866,7 +866,7 @@ struct intel_crtc_state {
>  
>  	/*
>  	 * Frequence the dpll for the port should run at. Differs from the
> -	 * adjusted dotclock e.g. for DP or 12bpc hdmi mode. This is also
> +	 * adjusted dotclock e.g. for DP or 10/12bpc hdmi mode. This is also
>  	 * already multiplied by pixel_multiplier.
>  	 */
>  	int port_clock;
> -- 
> 2.17.1

-- 
Ville Syrjälä
Intel