Skip to content

L
linux
Commit 0be6f0c8 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files
Options

drm/i915: Disable all infoframes when turning off the HDMI port 

Currently we just disable the GCP infoframe when turning off the port.
That means if the same transcoder is used on a DP port next, we might
end up pushing infoframes over DP, which isn't intended. Just disable
all the infoframes when turning off the port.

Also protect against two ports stomping on each other on g4x due to
the single video DIP instance. Now only the first port to enable
gets to send infoframes.

v2: Rebase
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChandra Konduru <Chandra.konduru@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bf868c7d
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 45 deletions
drivers/gpu/drm/i915/intel_hdmi.c
View file @ 0be6f0c8
...@@ -514,7 +514,13 @@ static void g4x_set_infoframes(struct drm_encoder *encoder, ...@@ -514,7 +514,13 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
if (!enable) { if (!enable) {
if (!(val & VIDEO_DIP_ENABLE)) if (!(val & VIDEO_DIP_ENABLE))
return; return;
val &= ~VIDEO_DIP_ENABLE; if (port != (val & VIDEO_DIP_PORT_MASK)) {
DRM_DEBUG_KMS("video DIP still enabled on port %c\n",
(val & VIDEO_DIP_PORT_MASK) >> 29);
return;
}
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_SPD);
I915_WRITE(reg, val); I915_WRITE(reg, val);
POSTING_READ(reg); POSTING_READ(reg);
return; return;
...@@ -522,16 +528,17 @@ static void g4x_set_infoframes(struct drm_encoder *encoder, ...@@ -522,16 +528,17 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
if (port != (val & VIDEO_DIP_PORT_MASK)) { if (port != (val & VIDEO_DIP_PORT_MASK)) {
if (val & VIDEO_DIP_ENABLE) { if (val & VIDEO_DIP_ENABLE) {
val &= ~VIDEO_DIP_ENABLE; DRM_DEBUG_KMS("video DIP already enabled on port %c\n",
I915_WRITE(reg, val); (val & VIDEO_DIP_PORT_MASK) >> 29);
POSTING_READ(reg); return;
} }
val &= ~VIDEO_DIP_PORT_MASK; val &= ~VIDEO_DIP_PORT_MASK;
val |= port; val |= port;
} }
val |= VIDEO_DIP_ENABLE; val |= VIDEO_DIP_ENABLE;
val &= ~VIDEO_DIP_ENABLE_VENDOR; val &= ~(VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_SPD);
I915_WRITE(reg, val); I915_WRITE(reg, val);
POSTING_READ(reg); POSTING_READ(reg);
...@@ -632,23 +639,6 @@ static bool intel_hdmi_set_gcp_infoframe(struct drm_encoder *encoder) ...@@ -632,23 +639,6 @@ static bool intel_hdmi_set_gcp_infoframe(struct drm_encoder *encoder)
return val != 0; return val != 0;
} }
static void intel_disable_gcp_infoframe(struct intel_crtc *crtc)
{
struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
u32 reg;
if (HAS_DDI(dev_priv))
reg = HSW_TVIDEO_DIP_CTL(crtc->config->cpu_transcoder);
else if (IS_VALLEYVIEW(dev_priv))
reg = VLV_TVIDEO_DIP_CTL(crtc->pipe);
else if (HAS_PCH_SPLIT(dev_priv->dev))
reg = TVIDEO_DIP_CTL(crtc->pipe);
else
return;
I915_WRITE(reg, I915_READ(reg) & ~VIDEO_DIP_ENABLE_GCP);
}
static void ibx_set_infoframes(struct drm_encoder *encoder, static void ibx_set_infoframes(struct drm_encoder *encoder,
bool enable, bool enable,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -669,25 +659,26 @@ static void ibx_set_infoframes(struct drm_encoder *encoder, ...@@ -669,25 +659,26 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
if (!enable) { if (!enable) {
if (!(val & VIDEO_DIP_ENABLE)) if (!(val & VIDEO_DIP_ENABLE))
return; return;
val &= ~VIDEO_DIP_ENABLE; val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
I915_WRITE(reg, val); I915_WRITE(reg, val);
POSTING_READ(reg); POSTING_READ(reg);
return; return;
} }
if (port != (val & VIDEO_DIP_PORT_MASK)) { if (port != (val & VIDEO_DIP_PORT_MASK)) {
if (val & VIDEO_DIP_ENABLE) { WARN(val & VIDEO_DIP_ENABLE,
val &= ~VIDEO_DIP_ENABLE; "DIP already enabled on port %c\n",
I915_WRITE(reg, val); (val & VIDEO_DIP_PORT_MASK) >> 29);
POSTING_READ(reg);
}
val &= ~VIDEO_DIP_PORT_MASK; val &= ~VIDEO_DIP_PORT_MASK;
val |= port; val |= port;
} }
val |= VIDEO_DIP_ENABLE; val |= VIDEO_DIP_ENABLE;
val &= ~(VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT | val &= ~(VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_GCP); VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
if (intel_hdmi_set_gcp_infoframe(encoder)) if (intel_hdmi_set_gcp_infoframe(encoder))
val |= VIDEO_DIP_ENABLE_GCP; val |= VIDEO_DIP_ENABLE_GCP;
...@@ -718,7 +709,9 @@ static void cpt_set_infoframes(struct drm_encoder *encoder, ...@@ -718,7 +709,9 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
if (!enable) { if (!enable) {
if (!(val & VIDEO_DIP_ENABLE)) if (!(val & VIDEO_DIP_ENABLE))
return; return;
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI); val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
I915_WRITE(reg, val); I915_WRITE(reg, val);
POSTING_READ(reg); POSTING_READ(reg);
return; return;
...@@ -727,7 +720,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder, ...@@ -727,7 +720,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
/* Set both together, unset both together: see the spec. */ /* Set both together, unset both together: see the spec. */
val |= VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI; val |= VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI;
val &= ~(VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT | val &= ~(VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
VIDEO_DIP_ENABLE_GCP); VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
if (intel_hdmi_set_gcp_infoframe(encoder)) if (intel_hdmi_set_gcp_infoframe(encoder))
val |= VIDEO_DIP_ENABLE_GCP; val |= VIDEO_DIP_ENABLE_GCP;
...@@ -760,25 +753,26 @@ static void vlv_set_infoframes(struct drm_encoder *encoder, ...@@ -760,25 +753,26 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
if (!enable) { if (!enable) {
if (!(val & VIDEO_DIP_ENABLE)) if (!(val & VIDEO_DIP_ENABLE))
return; return;
val &= ~VIDEO_DIP_ENABLE; val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
I915_WRITE(reg, val); I915_WRITE(reg, val);
POSTING_READ(reg); POSTING_READ(reg);
return; return;
} }
if (port != (val & VIDEO_DIP_PORT_MASK)) { if (port != (val & VIDEO_DIP_PORT_MASK)) {
if (val & VIDEO_DIP_ENABLE) { WARN(val & VIDEO_DIP_ENABLE,
val &= ~VIDEO_DIP_ENABLE; "DIP already enabled on port %c\n",
I915_WRITE(reg, val); (val & VIDEO_DIP_PORT_MASK) >> 29);
POSTING_READ(reg);
}
val &= ~VIDEO_DIP_PORT_MASK; val &= ~VIDEO_DIP_PORT_MASK;
val |= port; val |= port;
} }
val |= VIDEO_DIP_ENABLE; val |= VIDEO_DIP_ENABLE;
val &= ~(VIDEO_DIP_ENABLE_AVI | VIDEO_DIP_ENABLE_VENDOR | val &= ~(VIDEO_DIP_ENABLE_AVI |
VIDEO_DIP_ENABLE_GAMUT | VIDEO_DIP_ENABLE_GCP); VIDEO_DIP_ENABLE_VENDOR | VIDEO_DIP_ENABLE_GAMUT |
VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_ENABLE_GCP);
if (intel_hdmi_set_gcp_infoframe(encoder)) if (intel_hdmi_set_gcp_infoframe(encoder))
val |= VIDEO_DIP_ENABLE_GCP; val |= VIDEO_DIP_ENABLE_GCP;
...@@ -803,15 +797,16 @@ static void hsw_set_infoframes(struct drm_encoder *encoder, ...@@ -803,15 +797,16 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,
assert_hdmi_port_disabled(intel_hdmi); assert_hdmi_port_disabled(intel_hdmi);
val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
if (!enable) { if (!enable) {
I915_WRITE(reg, 0); I915_WRITE(reg, val);
POSTING_READ(reg); POSTING_READ(reg);
return; return;
} }
val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_GCP_HSW |
VIDEO_DIP_ENABLE_VS_HSW | VIDEO_DIP_ENABLE_GMP_HSW);
if (intel_hdmi_set_gcp_infoframe(encoder)) if (intel_hdmi_set_gcp_infoframe(encoder))
val |= VIDEO_DIP_ENABLE_GCP_HSW; val |= VIDEO_DIP_ENABLE_GCP_HSW;
...@@ -1107,7 +1102,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder) ...@@ -1107,7 +1102,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
POSTING_READ(intel_hdmi->hdmi_reg); POSTING_READ(intel_hdmi->hdmi_reg);
} }
intel_disable_gcp_infoframe(to_intel_crtc(encoder->base.crtc)); intel_hdmi->set_infoframes(&encoder->base, false, NULL);
} }
static void g4x_disable_hdmi(struct intel_encoder *encoder) static void g4x_disable_hdmi(struct intel_encoder *encoder)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7