提交 c36346e3 编写于 作者: D Damien Lespiau 提交者: Daniel Vetter

drm/i915: Implement ibx_digital_port_connected() for IBX

CPT+ PCHs have different bit definition to read the HPD live status. I
don't have an ILK with digital ports handy, which is why this patch is
separate from the CPT+ implementation. If the docs don't lie, it should
all be fine though.
Signed-off-by: NDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: NJani Nikula <jani.nikula@intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 577c7a50
...@@ -997,10 +997,21 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, ...@@ -997,10 +997,21 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
{ {
u32 bit; u32 bit;
/* XXX: IBX has different SDEISR bits */ if (HAS_PCH_IBX(dev_priv->dev)) {
if (HAS_PCH_IBX(dev_priv->dev)) switch(port->port) {
case PORT_B:
bit = SDE_PORTB_HOTPLUG;
break;
case PORT_C:
bit = SDE_PORTC_HOTPLUG;
break;
case PORT_D:
bit = SDE_PORTD_HOTPLUG;
break;
default:
return true; return true;
}
} else {
switch(port->port) { switch(port->port) {
case PORT_B: case PORT_B:
bit = SDE_PORTB_HOTPLUG_CPT; bit = SDE_PORTB_HOTPLUG_CPT;
...@@ -1014,6 +1025,7 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, ...@@ -1014,6 +1025,7 @@ bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
default: default:
return true; return true;
} }
}
return I915_READ(SDEISR) & bit; return I915_READ(SDEISR) & bit;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册