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

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

drm/i915/vlv: check port in infoframe_enabled v2 



Same as IBX and G4x, they all share the same genetic material.

v2: we all need a bit more port in our lives

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent baaa5cfb

drivers/gpu/drm/i915/intel_hdmi.c

+6 −1
Original line number Diff line number Diff line
@@ -324,10 +324,15 @@ static bool vlv_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 = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);

	u32 val = I915_READ(reg);

	u32 port = intel_dig_port->port;



	if (port == (val & VIDEO_DIP_PORT_MASK))

		return val & VIDEO_DIP_ENABLE;



	return false;

}



static void hsw_write_infoframe(struct drm_encoder *encoder,