[Intel-gfx] [PATCH] drm/i915/skl: Add back HDMI translation table

[Damien Lespiau]

On Wed, Apr 15, 2015 at 11:02:33AM +0530, Sonika Jindal wrote:
> The HDMI translation table is added back to bspec, so adding it,
> and defaulting the 800mV+0dB entry.
> 
> The HDMI translation table was removed by following commit as per HW team's
> recommendation:
> commit 7ff446708bd1 ("drm/i915/skl: Only use the 800mV+2bB HDMI translation entry")
> 
> v2: Adding reference to commit which removed this table (Jani)
> 
> Cc: Damien Lespiau <damien.lespiau at intel.com>
> Signed-off-by: Sonika Jindal <sonika.jindal at intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_ddi.c |   22 ++++++++++++----------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 5b50484..b974f8e 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -155,8 +155,17 @@ static const struct ddi_buf_trans skl_ddi_translations_edp[] = {
>  
>  
>  static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = {
> -					/* Idx	NT mV   T mV    db  */
> -	{ 0x00004014, 0x00000087 },	/* 0:	800	1000	2   */
> +	{ 0x00000018, 0x000000ac },
> +	{ 0x00005012, 0x0000009d },
> +	{ 0x00007011, 0x00000088 },
> +	{ 0x00000018, 0x000000a1 },
> +	{ 0x00000018, 0x00000098 },
> +	{ 0x00004013, 0x00000088 },
> +	{ 0x00006012, 0x00000087 },
> +	{ 0x00000018, 0x000000df },
> +	{ 0x00003015, 0x00000087 },
> +	{ 0x00003015, 0x000000c7 },
> +	{ 0x00000018, 0x000000c7 },
>  };
>  
>  enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
> @@ -214,16 +223,9 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port)
>  			n_edp_entries = ARRAY_SIZE(skl_ddi_translations_dp);
>  		}
>  
> -		/*
> -		 * On SKL, the recommendation from the hw team is to always use
> -		 * a certain type of level shifter (and thus the corresponding
> -		 * 800mV+2dB entry). Given that's the only validated entry, we
> -		 * override what is in the VBT, at least until further notice.
> -		 */
> -		hdmi_level = 0;
>  		ddi_translations_hdmi = skl_ddi_translations_hdmi;
>  		n_hdmi_entries = ARRAY_SIZE(skl_ddi_translations_hdmi);
> -		hdmi_default_entry = 0;
> +		hdmi_default_entry = 7;
>  	} else if (IS_BROADWELL(dev)) {
>  		ddi_translations_fdi = bdw_ddi_translations_fdi;
>  		ddi_translations_dp = bdw_ddi_translations_dp;
> -- 
> 1.7.10.4
>