On Thu, 06 Aug 2015, Xiong Zhang <xiong.y.zh...@intel.com> wrote:
> From: Rodrigo Vivi <rodrigo.v...@intel.com>
>
> On Skylake we have eDP-to-VGA using DDI-E and another aux.
> So let's identify it properly.
>
> Also let's remove duplicated definitions to avoid later
> confusion.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
Pushed to drm-intel-next-fixes with commit message rectified.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/intel_bios.h | 5 -----
> 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 02255d8..a2ef0df 100644
> --- a/drivers/gpu/drm/i915/intel_bios.h
> +++ b/drivers/gpu/drm/i915/intel_bios.h
> @@ -747,11 +747,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 7cd47bc..0643a91 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4978,16 +4978,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)
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
