aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-02-07 06:42:32 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-02-15 04:30:37 -0500
commit26739f12cf210cb8df35969258a1f064e8e12b63 (patch)
treeaeab9d851a200772872e2478427b8cb3f2a24576 /drivers/gpu/drm/i915/intel_dp.c
parent07ea0d85ac8adb87b817913d9720e3c76171b1f6 (diff)
drm/i915: unify HDMI/DP hpd definitions
They're physically the same pins and also the same bits, duplicating only confuses the reader. This also makes it a bit obvious that we have quite some code duplication going on here. Squashing that is for a larger rework in our hpd handling though. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 56e408b2e3c8..7b8bfe8982e6 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2302,13 +2302,13 @@ g4x_dp_detect(struct intel_dp *intel_dp)
2302 2302
2303 switch (intel_dig_port->port) { 2303 switch (intel_dig_port->port) {
2304 case PORT_B: 2304 case PORT_B:
2305 bit = DPB_HOTPLUG_LIVE_STATUS; 2305 bit = PORTB_HOTPLUG_LIVE_STATUS;
2306 break; 2306 break;
2307 case PORT_C: 2307 case PORT_C:
2308 bit = DPC_HOTPLUG_LIVE_STATUS; 2308 bit = PORTC_HOTPLUG_LIVE_STATUS;
2309 break; 2309 break;
2310 case PORT_D: 2310 case PORT_D:
2311 bit = DPD_HOTPLUG_LIVE_STATUS; 2311 bit = PORTD_HOTPLUG_LIVE_STATUS;
2312 break; 2312 break;
2313 default: 2313 default:
2314 return connector_status_unknown; 2314 return connector_status_unknown;
@@ -2838,15 +2838,15 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
2838 name = "DPDDC-A"; 2838 name = "DPDDC-A";
2839 break; 2839 break;
2840 case PORT_B: 2840 case PORT_B:
2841 dev_priv->hotplug_supported_mask |= DPB_HOTPLUG_INT_STATUS; 2841 dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;
2842 name = "DPDDC-B"; 2842 name = "DPDDC-B";
2843 break; 2843 break;
2844 case PORT_C: 2844 case PORT_C:
2845 dev_priv->hotplug_supported_mask |= DPC_HOTPLUG_INT_STATUS; 2845 dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;
2846 name = "DPDDC-C"; 2846 name = "DPDDC-C";
2847 break; 2847 break;
2848 case PORT_D: 2848 case PORT_D:
2849 dev_priv->hotplug_supported_mask |= DPD_HOTPLUG_INT_STATUS; 2849 dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;
2850 name = "DPDDC-D"; 2850 name = "DPDDC-D";
2851 break; 2851 break;
2852 default: 2852 default: