Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 62de9f4bce09..3b57bf06abe8 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -443,9 +443,17 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
         } else if (IS_BROADWELL(dev_priv)) {
                 ddi_translations_fdi = bdw_ddi_translations_fdi;
                 ddi_translations_dp = bdw_ddi_translations_dp;
-                ddi_translations_edp = bdw_ddi_translations_edp;
+
+                if (dev_priv->edp_low_vswing) {
+                        ddi_translations_edp = bdw_ddi_translations_edp;
+                        n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
+                } else {
+                        ddi_translations_edp = bdw_ddi_translations_dp;
+                        n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
+                }
+
                 ddi_translations_hdmi = bdw_ddi_translations_hdmi;
-                n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
+
                 n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
                 n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);
                 hdmi_default_entry = 7;
@@ -3201,12 +3209,6 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
         intel_ddi_clock_get(encoder, pipe_config);
 }
 
-static void intel_ddi_destroy(struct drm_encoder *encoder)
-{
-        /* HDMI has nothing special to destroy, so we can go with this. */
-        intel_dp_encoder_destroy(encoder);
-}
-
 static bool intel_ddi_compute_config(struct intel_encoder *encoder,
                                      struct intel_crtc_state *pipe_config)
 {
@@ -3225,7 +3227,8 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder,
 }
 
 static const struct drm_encoder_funcs intel_ddi_funcs = {
-        .destroy = intel_ddi_destroy,
+        .reset = intel_dp_encoder_reset,
+        .destroy = intel_dp_encoder_destroy,
 };
 
 static struct intel_connector *
@@ -3324,6 +3327,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
         intel_encoder->post_disable = intel_ddi_post_disable;
         intel_encoder->get_hw_state = intel_ddi_get_hw_state;
         intel_encoder->get_config = intel_ddi_get_config;
+        intel_encoder->suspend = intel_dp_encoder_suspend;
 
         intel_dig_port->port = port;
         intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &