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

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 56dd7a9a8e25..7312beb6f1fc 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -143,7 +143,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
                 imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
 
         if (imx_ldb_ch->edid) {
-                drm_mode_connector_update_edid_property(connector,
+                drm_connector_update_edid_property(connector,
                                                         imx_ldb_ch->edid);
                 num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
         }
@@ -471,8 +471,7 @@ static int imx_ldb_register(struct drm_device *drm,
                 drm_connector_init(drm, &imx_ldb_ch->connector,
                                 &imx_ldb_connector_funcs,
                                 DRM_MODE_CONNECTOR_LVDS);
-                drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
-                                encoder);
+                drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder);
         }
 
         if (imx_ldb_ch->panel) {