On Fri, Oct 14, 2016 at 02:14:02PM -0700, California Sullivan wrote:
> The addition of a new function and some return types was missed in the
> original merge, causing build errors.
> 

If it were me, I would want to have details on exactly which patches had
conflicts, since it appears you went patch by patch based on your cover-letter.

Is that right?

That'll yield a bit more detail which, if there are issues later, could help
point is in the right location (that is, if there are regressions, or when we
run into merge conflicts on the next stable update/backport).

Eric



> Signed-off-by: California Sullivan <california.l.sulli...@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h      |  1 +
>  drivers/gpu/drm/i915/intel_bios.c    | 39 
> ++++++++++++++++++++++++++++++++++++
>  drivers/gpu/drm/i915/intel_display.c |  2 ++
>  drivers/gpu/drm/i915/intel_dp.c      |  6 +++---
>  drivers/gpu/drm/i915/intel_drv.h     |  2 +-
>  5 files changed, 46 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6f1e0f1..19819aa 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3485,6 +3485,7 @@ bool intel_bios_is_port_edp(struct drm_i915_private 
> *dev_priv, enum port port);
>  bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port 
> *port);
>  bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv,
>                                    enum port port);
> +bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port 
> port);
>  
>  /* intel_opregion.c */
>  #ifdef CONFIG_ACPI
> diff --git a/drivers/gpu/drm/i915/intel_bios.c 
> b/drivers/gpu/drm/i915/intel_bios.c
> index e72dd9a..8118364 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1660,3 +1660,42 @@ intel_bios_is_port_hpd_inverted(struct 
> drm_i915_private *dev_priv,
>  
>       return false;
>  }
> +
> +/**
> + * intel_bios_is_port_present - is the specified digital port present
> + * @dev_priv:        i915 device instance
> + * @port:    port to check
> + *
> + * Return true if the device in %port is present.
> + */
> +bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port 
> port)
> +{
> +     static const struct {
> +             u16 dp, hdmi;
> +     } port_mapping[] = {
> +             [PORT_B] = { DVO_PORT_DPB, DVO_PORT_HDMIB, },
> +             [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, },
> +             [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
> +             [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
> +     };
> +     int i;
> +
> +     /* FIXME maybe deal with port A as well? */
> +     if (WARN_ON(port == PORT_A) || port >= ARRAY_SIZE(port_mapping))
> +             return false;
> +
> +     if (!dev_priv->vbt.child_dev_num)
> +             return false;
> +
> +     for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
> +             const union child_device_config *p_child =
> +                     &dev_priv->vbt.child_dev[i];
> +             if ((p_child->common.dvo_port == port_mapping[port].dp ||
> +                  p_child->common.dvo_port == port_mapping[port].hdmi) &&
> +                 (p_child->common.device_type & 
> (DEVICE_TYPE_TMDS_DVI_SIGNALING |
> +                                                 
> DEVICE_TYPE_DISPLAYPORT_OUTPUT)))
> +                     return true;
> +     }
> +
> +     return false;
> +}
> diff --git a/drivers/gpu/drm/i915/intel_display.c 
> b/drivers/gpu/drm/i915/intel_display.c
> index 8a4a372..bf0e19c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14559,6 +14559,8 @@ static void intel_setup_outputs(struct drm_device 
> *dev)
>               if (I915_READ(PCH_DP_D) & DP_DETECTED)
>                       intel_dp_init(dev, PCH_DP_D, PORT_D);
>       } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
> +             bool has_edp, has_port;
> +
>               /*
>                * The DP_DETECTED bit is the latched state of the DDC
>                * SDA pin at boot. However since eDP doesn't require DDC
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 62bd8f7..12bd17f 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5957,9 +5957,9 @@ fail:
>       return false;
>  }
>  
> -void
> -intel_dp_init(struct drm_device *dev,
> -           i915_reg_t output_reg, enum port port)
> +bool intel_dp_init(struct drm_device *dev,
> +                i915_reg_t output_reg,
> +                enum port port)
>  {
>       struct drm_i915_private *dev_priv = dev->dev_private;
>       struct intel_digital_port *intel_dig_port;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h 
> b/drivers/gpu/drm/i915/intel_drv.h
> index 236ce98..6f69e14 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1279,7 +1279,7 @@ void intel_csr_ucode_suspend(struct drm_i915_private *);
>  void intel_csr_ucode_resume(struct drm_i915_private *);
>  
>  /* intel_dp.c */
> -void intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port 
> port);
> +bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port 
> port);
>  bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
>                            struct intel_connector *intel_connector);
>  void intel_dp_set_link_params(struct intel_dp *intel_dp,
> -- 
> 2.5.5
> 
> -- 
> _______________________________________________
> linux-yocto mailing list
> linux-yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/linux-yocto
-- 
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Reply via email to