diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-01-29 18:22:21 -0500 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-01-30 13:24:20 -0500 |
commit | cf53902f48c3c7a34c6955f79c8800d1746de52c (patch) | |
tree | 5155e2ca146271dc0534849cb2357acbbecfbbcf /drivers/gpu/drm/i915/intel_hdmi.c | |
parent | 7533eb4f89f70f9efb81171bcfa528f51d3d2618 (diff) |
drm/i915/cnl: Add HPD support for Port F.
On CNP boards that are using DDI F,
bit 25 (SDE_PORTE_HOTPLUG_SPT) is representing
the Digital Port F hotplug line when the Digital
Port F hotplug detect input is enabled.
v2: Reuse all existent structure instead of adding a
new HPD_PORT_F pointing to pin of port E.
v3: Use IS_CNL_WITH_PORT_F so we can start upstreaming
this right now. If that SKU ever get a proper name
we come back and update it.
v4: Rebase on top of digital connected port using encoder
instead of port.
v5: Moved IS_CNL_WITH_PORT_F definition to the PCI IDs patch.
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180129232223.766-8-rodrigo.vivi@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index a8f05f7d9226..2df18a85c3b4 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -2091,7 +2091,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, | |||
2091 | 2091 | ||
2092 | if (WARN_ON(port == PORT_A)) | 2092 | if (WARN_ON(port == PORT_A)) |
2093 | return; | 2093 | return; |
2094 | intel_encoder->hpd_pin = intel_hpd_pin(port); | 2094 | intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port); |
2095 | 2095 | ||
2096 | if (HAS_DDI(dev_priv)) | 2096 | if (HAS_DDI(dev_priv)) |
2097 | intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; | 2097 | intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; |