aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/intel_bios.h5
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c9
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index a59122731efd..46cd5c7ebacd 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -758,11 +758,6 @@ int intel_parse_bios(struct drm_device *dev);
758#define DVO_C 2 758#define DVO_C 2
759#define DVO_D 3 759#define DVO_D 3
760 760
761/* define the PORT for DP output type */
762#define PORT_IDPB 7
763#define PORT_IDPC 8
764#define PORT_IDPD 9
765
766/* Possible values for the "DVO Port" field for versions >= 155: */ 761/* Possible values for the "DVO Port" field for versions >= 155: */
767#define DVO_PORT_HDMIA 0 762#define DVO_PORT_HDMIA 0
768#define DVO_PORT_HDMIB 1 763#define DVO_PORT_HDMIB 1
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 94686cb7621e..32663b1933f1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5015,16 +5015,17 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc)
5015 return -1; 5015 return -1;
5016} 5016}
5017 5017
5018/* check the VBT to see whether the eDP is on DP-D port */ 5018/* check the VBT to see whether the eDP is on another port */
5019bool intel_dp_is_edp(struct drm_device *dev, enum port port) 5019bool intel_dp_is_edp(struct drm_device *dev, enum port port)
5020{ 5020{
5021 struct drm_i915_private *dev_priv = dev->dev_private; 5021 struct drm_i915_private *dev_priv = dev->dev_private;
5022 union child_device_config *p_child; 5022 union child_device_config *p_child;
5023 int i; 5023 int i;
5024 static const short port_mapping[] = { 5024 static const short port_mapping[] = {
5025 [PORT_B] = PORT_IDPB, 5025 [PORT_B] = DVO_PORT_DPB,
5026 [PORT_C] = PORT_IDPC, 5026 [PORT_C] = DVO_PORT_DPC,
5027 [PORT_D] = PORT_IDPD, 5027 [PORT_D] = DVO_PORT_DPD,
5028 [PORT_E] = DVO_PORT_DPE,
5028 }; 5029 };
5029 5030
5030 if (port == PORT_A) 5031 if (port == PORT_A)