Commit f061b9be authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915/ddi: set has_infoframe flag on DDI too v2 



Just like we do in the HDMI code, set the infoframe flag if we detect
that infoframes are enabled.

v2: check for actual infoframe status as in hdmi code (Daniel)

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 151a49d0

drivers/gpu/drm/i915/intel_ddi.c

+8 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,14 @@ void intel_ddi_get_config(struct intel_encoder *encoder, 
		break;

	}



	if (encoder->type == INTEL_OUTPUT_HDMI) {

		struct intel_hdmi *intel_hdmi =

			enc_to_intel_hdmi(&encoder->base);



		if (intel_hdmi->infoframe_enabled(&encoder->base))

			pipe_config->has_infoframe = true;

	}



	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {

		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);

		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))