On Fri, Nov 21, 2014 at 11:13:02AM -0800, [email protected] wrote: > From: Clint Taylor <[email protected]> > > CHV infoframes were not being enabled. > > Signed-off-by: Clint Taylor <[email protected]> > --- > drivers/gpu/drm/i915/intel_hdmi.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c > b/drivers/gpu/drm/i915/intel_hdmi.c > index ec87333..3abc200 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -1461,10 +1461,13 @@ static void chv_hdmi_post_disable(struct > intel_encoder *encoder) > static void chv_hdmi_pre_enable(struct intel_encoder *encoder) > { > struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); > + struct intel_hdmi *intel_hdmi = &dport->hdmi; > struct drm_device *dev = encoder->base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_crtc *intel_crtc = > to_intel_crtc(encoder->base.crtc); > + struct drm_display_mode *adjusted_mode = > + &intel_crtc->config.adjusted_mode; > enum dpio_channel ch = vlv_dport_to_channel(dport); > int pipe = intel_crtc->pipe; > int data, i; > @@ -1589,6 +1592,10 @@ static void chv_hdmi_pre_enable(struct intel_encoder > *encoder) > > mutex_unlock(&dev_priv->dpio_lock); > > + intel_hdmi->set_infoframes(&encoder->base, > + intel_crtc->config.has_hdmi_sink, > + adjusted_mode); > +
Yep, used to live in the mode_set hook I think, and chv support wasn't there yet when it all got rearranged. Reviewed-by: Ville Syrjälä <[email protected]> > intel_enable_hdmi(encoder); > > vlv_wait_port_ready(dev_priv, dport); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
