diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2015-08-06 15:51:39 +0800 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-08-31 18:36:38 +0300 |
| commit | 477ec3283c324d16e8da07a8d8a4a367e31b6eab (patch) | |
| tree | 0a309d40444c6c524bcf7ba1e7fe089164852120 /drivers | |
| parent | 2800e4c228b8961c4da1a4925cc20c16e623851b (diff) | |
| download | linux-stable-477ec3283c324d16e8da07a8d8a4a367e31b6eab.tar.gz linux-stable-477ec3283c324d16e8da07a8d8a4a367e31b6eab.tar.bz2 linux-stable-477ec3283c324d16e8da07a8d8a4a367e31b6eab.zip | |
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: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Xiong Zhang <xiong.y.zhang@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.h | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 9 |
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); #define DVO_C 2 #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: */ #define DVO_PORT_HDMIA 0 #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) 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) { struct drm_i915_private *dev_priv = dev->dev_private; union child_device_config *p_child; int i; static const short port_mapping[] = { - [PORT_B] = PORT_IDPB, - [PORT_C] = PORT_IDPC, - [PORT_D] = PORT_IDPD, + [PORT_B] = DVO_PORT_DPB, + [PORT_C] = DVO_PORT_DPC, + [PORT_D] = DVO_PORT_DPD, + [PORT_E] = DVO_PORT_DPE, }; if (port == PORT_A) |