|
@@ -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,
|