[PATCH v4 23/23] drm/i915: Provide ddc symlink in hdmi connector sysfs directory

[Daniel Vetter]

On Thu, Jul 11, 2019 at 02:59:26PM +0300, Ville Syrjälä wrote:
> On Thu, Jul 11, 2019 at 01:26:50PM +0200, Andrzej Pietrasiewicz wrote:
> > Use the ddc pointer provided by the generic connector.
> 
> We already have a symlink via intel_hdmi_create_i2c_symlink(). I guess
> we should remove that in favor of the generic one. Oleg?

Since that commit is very new I think we should try real hard to avoid the
i915-ism here ...
-Daniel

> 
> > 
> > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p at collabora.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> > index 0ebec69bbbfc..678fa4d1bd4e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> > @@ -3094,6 +3094,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> >  		 intel_dig_port->max_lanes, port_name(port)))
> >  		return;
> >  
> > +	intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
> > +	connector->ddc = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
> > +
> >  	drm_connector_init(dev, connector, &intel_hdmi_connector_funcs,
> >  			   DRM_MODE_CONNECTOR_HDMIA);
> >  	drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);
> > @@ -3105,8 +3108,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> >  	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> >  		connector->ycbcr_420_allowed = true;
> >  
> > -	intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
> > -
> >  	if (WARN_ON(port == PORT_A))
> >  		return;
> >  	intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
> > -- 
> > 2.17.1
> 
> -- 
> Ville Syrjälä
> Intel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch