5 files changed, 9 insertions, 10 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 1b278a22c8b7..1067e702c22c 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -224,7 +224,7 @@ static void tilcdc_crtc_set_clk(struct drm_crtc *crtc)
 
         ret = clk_set_rate(priv->clk, req_rate * clkdiv);
         clk_rate = clk_get_rate(priv->clk);
-        if (ret < 0) {
+        if (ret < 0 || tilcdc_pclk_diff(req_rate, clk_rate) > 5) {
                 /*
                  * If we fail to set the clock rate (some architectures don't
                  * use the common clock framework yet and may not implement
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index b8a5e4ed22e6..0fb300d41a09 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -378,7 +378,7 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev)
         if (!priv->external_connector &&
             ((priv->num_encoders == 0) || (priv->num_connectors == 0))) {
                 dev_err(dev, "no encoders/connectors found\n");
-                ret = -ENXIO;
+                ret = -EPROBE_DEFER;
                 goto init_failed;
         }
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c
index d651bdd6597e..b4eaf9bc87f8 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_external.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c
@@ -103,12 +103,11 @@ struct drm_connector *tilcdc_encoder_find_connector(struct drm_device *ddev,
                                                     struct drm_encoder *encoder)
 {
         struct drm_connector *connector;
-        int i;
 
-        list_for_each_entry(connector, &ddev->mode_config.connector_list, head)
-                for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++)
-                        if (connector->encoder_ids[i] == encoder->base.id)
-                                return connector;
+        list_for_each_entry(connector, &ddev->mode_config.connector_list, head) {
+                if (drm_connector_has_possible_encoder(connector, encoder))
+                        return connector;
+        }
 
         dev_err(ddev->dev, "No connector found for %s encoder (id %d)\n",
                 encoder->name, encoder->base.id);
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index d616d64a6725..a1acab39d87f 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -223,7 +223,7 @@ static struct drm_connector *panel_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;
 
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;