Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / tilcdc / tilcdc_tfp410.c

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index c45cabb38db0114da1d407e3f54e6b0866967a43..daebf1aa6b0a841dc28d8b681e591b5445a116c1 100644 (file)
--- 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;