Commit 477ec328 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Jani Nikula

drm/i915: eDP can be present on DDI-E

Enable eDP on DDI-E.

Also let's remove duplicated definitions to avoid later confusion.
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarXiong Zhang <xiong.y.zhang@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2800e4c2
...@@ -758,11 +758,6 @@ int intel_parse_bios(struct drm_device *dev); ...@@ -758,11 +758,6 @@ int intel_parse_bios(struct drm_device *dev);
#define DVO_C 2 #define DVO_C 2
#define DVO_D 3 #define DVO_D 3
/* define the PORT for DP output type */
#define PORT_IDPB 7
#define PORT_IDPC 8
#define PORT_IDPD 9
/* Possible values for the "DVO Port" field for versions >= 155: */ /* Possible values for the "DVO Port" field for versions >= 155: */
#define DVO_PORT_HDMIA 0 #define DVO_PORT_HDMIA 0
#define DVO_PORT_HDMIB 1 #define DVO_PORT_HDMIB 1
......
...@@ -5015,16 +5015,17 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc) ...@@ -5015,16 +5015,17 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc)
return -1; return -1;
} }
/* check the VBT to see whether the eDP is on DP-D port */ /* check the VBT to see whether the eDP is on another port */
bool intel_dp_is_edp(struct drm_device *dev, enum port port) bool intel_dp_is_edp(struct drm_device *dev, enum port port)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
union child_device_config *p_child; union child_device_config *p_child;
int i; int i;
static const short port_mapping[] = { static const short port_mapping[] = {
[PORT_B] = PORT_IDPB, [PORT_B] = DVO_PORT_DPB,
[PORT_C] = PORT_IDPC, [PORT_C] = DVO_PORT_DPC,
[PORT_D] = PORT_IDPD, [PORT_D] = DVO_PORT_DPD,
[PORT_E] = DVO_PORT_DPE,
}; };
if (port == PORT_A) if (port == PORT_A)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment