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, 2 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index c45cabb38db0..daebf1aa6b0a 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -173,7 +173,7 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)
 
         edid = drm_get_edid(connector, tfp410_connector->mod->i2c);
 
-        drm_mode_connector_update_edid_property(connector, edid);
+        drm_connector_update_edid_property(connector, edid);
 
         if (edid) {
                 ret = drm_add_edid_modes(connector, edid);
@@ -240,7 +240,7 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
         connector->interlace_allowed = 0;
         connector->doublescan_allowed = 0;
 
-        ret = drm_mode_connector_attach_encoder(connector, encoder);
+        ret = drm_connector_attach_encoder(connector, encoder);
         if (ret)
                 goto fail;