drm/i915: add port field to struct intel_dp and use it

This will be needed for Haswell, but already has its uses here.

This patch started as a small patch written patch by Shobhit Kumar,
but it has changed so much that none of its original lines remain.

Credits-to: Shobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e86fd3977f73..f8c2aa1ec27a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6764,10 +6764,10 @@ static void intel_setup_outputs(struct drm_device *dev)
                 dpd_is_edp = intel_dpd_is_edp(dev);
 
                 if (has_edp_a(dev))
-                        intel_dp_init(dev, DP_A);
+                        intel_dp_init(dev, DP_A, PORT_A);
 
                 if (dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED))
-                        intel_dp_init(dev, PCH_DP_D);
+                        intel_dp_init(dev, PCH_DP_D, PORT_D);
         }
 
         intel_crt_init(dev);
@@ -6800,7 +6800,7 @@ static void intel_setup_outputs(struct drm_device *dev)
                         if (!found)
                                 intel_hdmi_init(dev, HDMIB, PORT_B);
                         if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED))
-                                intel_dp_init(dev, PCH_DP_B);
+                                intel_dp_init(dev, PCH_DP_B, PORT_B);
                 }
 
                 if (I915_READ(HDMIC) & PORT_DETECTED)
@@ -6810,10 +6810,10 @@ static void intel_setup_outputs(struct drm_device *dev)
                         intel_hdmi_init(dev, HDMID, PORT_D);
 
                 if (I915_READ(PCH_DP_C) & DP_DETECTED)
-                        intel_dp_init(dev, PCH_DP_C);
+                        intel_dp_init(dev, PCH_DP_C, PORT_C);
 
                 if (!dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED))
-                        intel_dp_init(dev, PCH_DP_D);
+                        intel_dp_init(dev, PCH_DP_D, PORT_D);
         } else if (IS_VALLEYVIEW(dev)) {
                 int found;
 
@@ -6823,7 +6823,7 @@ static void intel_setup_outputs(struct drm_device *dev)
                         if (!found)
                                 intel_hdmi_init(dev, SDVOB, PORT_B);
                         if (!found && (I915_READ(DP_B) & DP_DETECTED))
-                                intel_dp_init(dev, DP_B);
+                                intel_dp_init(dev, DP_B, PORT_B);
                 }
 
                 if (I915_READ(SDVOC) & PORT_DETECTED)
@@ -6831,7 +6831,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 
                 /* Shares lanes with HDMI on SDVOC */
                 if (I915_READ(DP_C) & DP_DETECTED)
-                        intel_dp_init(dev, DP_C);
+                        intel_dp_init(dev, DP_C, PORT_C);
         } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
                 bool found = false;
 
@@ -6845,7 +6845,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 
                         if (!found && SUPPORTS_INTEGRATED_DP(dev)) {
                                 DRM_DEBUG_KMS("probing DP_B\n");
-                                intel_dp_init(dev, DP_B);
+                                intel_dp_init(dev, DP_B, PORT_B);
                         }
                 }
 
@@ -6864,14 +6864,14 @@ static void intel_setup_outputs(struct drm_device *dev)
                         }
                         if (SUPPORTS_INTEGRATED_DP(dev)) {
                                 DRM_DEBUG_KMS("probing DP_C\n");
-                                intel_dp_init(dev, DP_C);
+                                intel_dp_init(dev, DP_C, PORT_C);
                         }
                 }
 
                 if (SUPPORTS_INTEGRATED_DP(dev) &&
                     (I915_READ(DP_D) & DP_DETECTED)) {
                         DRM_DEBUG_KMS("probing DP_D\n");
-                        intel_dp_init(dev, DP_D);
+                        intel_dp_init(dev, DP_D, PORT_D);
                 }
         } else if (IS_GEN2(dev))
                 intel_dvo_init(dev);