diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-11-20 13:24:13 -0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-20 22:51:25 +0100 |
| commit | 89a35ecdc6aa5a88165313ca5cfd52b8e8e7fbbd (patch) | |
| tree | a1f3768ce4a23fe37183ef49ad7b0ed459301ec2 /drivers/gpu/drm | |
| parent | d9e600b2e4a5e9f1dfe80cfcb453c8f5067a2a8a (diff) | |
| download | op-kernel-dev-89a35ecdc6aa5a88165313ca5cfd52b8e8e7fbbd.zip op-kernel-dev-89a35ecdc6aa5a88165313ca5cfd52b8e8e7fbbd.tar.gz | |
drm/i915/g4x: fix g4x infoframe readout
Need to check the port too.
Reported-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
| -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 f58e883..ec87333 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -170,9 +170,13 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); u32 val = I915_READ(VIDEO_DIP_CTL); - 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 ibx_write_infoframe(struct drm_encoder *encoder, |
