aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2013-02-25 12:06:49 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-26 16:50:22 -0400
commit1d843f9de4e6dc6a899b6f07f106c00da09925e6 (patch)
tree29c979eae847b62f3406547253c370bdee86348a /drivers/gpu/drm/i915/intel_hdmi.c
parentfa00abe00e379a0e9b070616baee58692576f29e (diff)
DRM/I915: Add enum hpd_pin to intel_encoder.
To clean up hotplug support we add a new enum to intel_encoder: enum hpd_pin. It allows the encoder to request a hpd line but leave the details which IRQ is responsible on which chipset generation to i915_irq.c. This way requesting hotplug support will become really simple on the encoder/connector level. Signed-off-by: Egbert Eich <eich@suse.de> Acked-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2474b1b6de61..6d92aebadfc3 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -988,17 +988,21 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
988 switch (port) { 988 switch (port) {
989 case PORT_B: 989 case PORT_B:
990 intel_hdmi->ddc_bus = GMBUS_PORT_DPB; 990 intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
991 intel_encoder->hpd_pin = HPD_PORT_B;
991 dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS; 992 dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;
992 break; 993 break;
993 case PORT_C: 994 case PORT_C:
994 intel_hdmi->ddc_bus = GMBUS_PORT_DPC; 995 intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
996 intel_encoder->hpd_pin = HPD_PORT_C;
995 dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS; 997 dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;
996 break; 998 break;
997 case PORT_D: 999 case PORT_D:
998 intel_hdmi->ddc_bus = GMBUS_PORT_DPD; 1000 intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
1001 intel_encoder->hpd_pin = HPD_PORT_D;
999 dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS; 1002 dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;
1000 break; 1003 break;
1001 case PORT_A: 1004 case PORT_A:
1005 intel_encoder->hpd_pin = HPD_PORT_A;
1002 /* Internal port only for eDP. */ 1006 /* Internal port only for eDP. */
1003 default: 1007 default:
1004 BUG(); 1008 BUG();