Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index d88d0f5abdce..18c65f8e4fe8 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -402,20 +402,10 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *c
         return &intel_dp->mst_encoders[crtc->pipe]->base.base;
 }
 
-static struct drm_encoder *intel_mst_best_encoder(struct drm_connector *connector)
-{
-        struct intel_connector *intel_connector = to_intel_connector(connector);
-        struct intel_dp *intel_dp = intel_connector->mst_port;
-        if (!intel_dp)
-                return NULL;
-        return &intel_dp->mst_encoders[0]->base.base;
-}
-
 static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = {
         .get_modes = intel_dp_mst_get_modes,
         .mode_valid = intel_dp_mst_mode_valid,
         .atomic_best_encoder = intel_mst_atomic_best_encoder,
-        .best_encoder = intel_mst_best_encoder,
         .atomic_check = intel_dp_mst_atomic_check,
 };
 
@@ -475,8 +465,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
                 struct drm_encoder *enc =
                         &intel_dp->mst_encoders[pipe]->base.base;
 
-                ret = drm_mode_connector_attach_encoder(&intel_connector->base,
-                                                        enc);
+                ret = drm_connector_attach_encoder(&intel_connector->base, enc);
                 if (ret)
                         goto err;
         }
@@ -484,7 +473,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
         drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
         drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
 
-        ret = drm_mode_connector_set_path_property(connector, pathprop);
+        ret = drm_connector_set_path_property(connector, pathprop);
         if (ret)
                 goto err;