Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4eb1564 authored by Clint Taylor's avatar Clint Taylor Committed by Daniel Vetter
Browse files

drm/i915/chv: Enable AVI, SPD and HDMI infoframes for CHV. 



CHV infoframes were not being enabled.

Signed-off-by: default avatarClint Taylor <clinton.a.taylor@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b9950a13

drivers/gpu/drm/i915/intel_hdmi.c

+7 −0
Original line number Diff line number Diff line
@@ -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);



	intel_enable_hdmi(encoder);



	vlv_wait_port_ready(dev_priv, dport);