[Intel-gfx] [PATCH 7/7] drm/i915/cnl: Extend HDMI 2.0 support to CNL.

[Rodrigo Vivi]

On Wed, Nov 15, 2017 at 11:14:48AM +0000, Ville Syrjälä wrote:
> On Tue, Nov 14, 2017 at 11:47:59AM -0800, Rodrigo Vivi wrote:
> > Starting on GLK we support HDMI 2.0. So this patch only
> > extend the work Shashank has made to GLK to CNL.
> > 
> > v2: The version that compiles :/
> > 
> > Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> > Cc: Shashank Sharma <shashank.sharma at intel.com>
> > Cc: Manasi Navare <manasi.d.navare at intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_hdmi.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > index 2d95db64cdf2..96c314a6170a 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -1235,7 +1235,7 @@ static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
> >  		&dev_priv->vbt.ddi_port_info[encoder->port];
> >  	int max_tmds_clock;
> >  
> > -	if (IS_GEMINILAKE(dev_priv))
> > +	if (IS_GEMINILAKE(dev_priv) || INTEL_GEN(dev_priv) >= 10)
> 
> Cay you reorder this to 'GEN >= 10 || IS_GLK' ? (+ maybe the others to
> match).

Sure. I fully agree with this logic.

Would you be ok with Shashank request on
#define HAS_HDMI2_SUPPORT INTEL_GEN >= 10 || IS_GLK ?

Thanks,
Rodrigo.

> 
> I'd like to keep this in neat order from new to old, to
> make it easier to read.
> 
> With that 
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> >  		max_tmds_clock = 594000;
> >  	else if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv))
> >  		max_tmds_clock = 300000;
> > @@ -1511,7 +1511,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
> >  
> >  	pipe_config->lane_count = 4;
> >  
> > -	if (scdc->scrambling.supported && IS_GEMINILAKE(dev_priv)) {
> > +	if (scdc->scrambling.supported && (IS_GEMINILAKE(dev_priv) ||
> > +					   INTEL_GEN(dev_priv) >= 10)) {
> >  		if (scdc->scrambling.low_rates)
> >  			pipe_config->hdmi_scrambling = true;
> >  
> > @@ -2033,7 +2034,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> >  	connector->doublescan_allowed = 0;
> >  	connector->stereo_allowed = 1;
> >  
> > -	if (IS_GEMINILAKE(dev_priv))
> > +	if (IS_GEMINILAKE(dev_priv) || INTEL_GEN(dev_priv) >= 10)
> >  		connector->ycbcr_420_allowed = true;
> >  
> >  	intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
> > -- 
> > 2.13.6
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC