diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2015-04-29 15:30:07 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-04-30 11:09:39 +0300 |
| commit | 052f62f78955106a14961f0d3d34c256e896303a (patch) | |
| tree | 0a30fda323d836c290c32344cdbc37acbabb0be3 /drivers | |
| parent | drm/i915/hdmi: fix vlv infoframe port check (diff) | |
| download | linux-dev-052f62f78955106a14961f0d3d34c256e896303a.tar.xz linux-dev-052f62f78955106a14961f0d3d34c256e896303a.zip | |
drm/i915/hdmi: check port in ibx_infoframe_enabled
Add port check for ibx similar to vlv in
commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
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: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 3b9c1176be5b..f8d0d81da47d 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -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); - return val & VIDEO_DIP_ENABLE; + 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, |