drm/i915/hdmi: fix vlv infoframe port check (eeea3e67) · Commits · e / devices / android_kernel_oneplus_sm8150

Due to missing shifting, the vlv infoframe port check only works for port A. Fix it. Broken since introduction in commit Author: Jesse Barnes <jbarnes@virtuousgeek.org> Date: Wed Apr 15 16:52:29 2015 -0700 drm/i915/vlv: check port in infoframe_enabled v2 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90059 Tested-by:

xubin <bin.a.xu@intel.com> Tested-by:

Ye Tian <yex.tian@intel.com> Reviewed-by:

Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by:

Jani Nikula <jani.nikula@intel.com>

drivers/gpu/drm/i915/intel_hdmi.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -327,9 +327,8 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder)
	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);		struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
	int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);		int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);
	u32 val = I915_READ(reg);		u32 val = I915_READ(reg);
	u32 port = intel_dig_port->port;

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

	return false;		return false;