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

Commit 052f62f7 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hdmi: check port in ibx_infoframe_enabled 



Add port check for ibx similar to vlv in

commit 535afa2e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Wed Apr 15 16:52:29 2015 -0700

    drm/i915/vlv: check port in infoframe_enabled v2

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent eeea3e67

drivers/gpu/drm/i915/intel_hdmi.c

+5 −1
Original line number Diff line number Diff line
@@ -223,10 +223,14 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder) 
	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	int reg = TVIDEO_DIP_CTL(intel_crtc->pipe);

	u32 val = I915_READ(reg);



	if (VIDEO_DIP_PORT(intel_dig_port->port) == (val & VIDEO_DIP_PORT_MASK))

		return val & VIDEO_DIP_ENABLE;



	return false;

}



static void cpt_write_infoframe(struct drm_encoder *encoder,