--- initial
+++ final
@@ -1,79 +1,79 @@
 static enum drm_connector_status nouveau_connector_detect(struct drm_connector *connector, bool force) {
   struct drm_device *dev = connector->dev;
   struct nouveau_drm *drm = nouveau_drm(dev);
   struct nouveau_connector *nv_connector = nouveau_connector(connector);
   struct nouveau_encoder *nv_encoder = NULL;
   struct nouveau_encoder *nv_partner;
   struct i2c_adapter *i2c;
   int type;
   int ret;
   enum drm_connector_status conn_status = connector_status_disconnected;
   /* Cleanup the previous EDID block. */
   if (nv_connector->edid) {
-    drm_mode_connector_update_edid_property(connector, NULL);
+    drm_connector_update_edid_property(connector, NULL);
     kfree(nv_connector->edid);
     nv_connector->edid = NULL;
   }
   /* Outputs are only polled while runtime active, so acquiring a
    * runtime PM ref here is unnecessary (and would deadlock upon
    * runtime suspend because it waits for polling to finish).
    */
   if (!drm_kms_helper_is_poll_worker()) {
     ret = pm_runtime_get_sync(connector->dev->dev);
     if (ret < 0 && ret != -EACCES) return conn_status;
   }
   nv_encoder = nouveau_connector_ddc_detect(connector);
   if (nv_encoder && (i2c = nv_encoder->i2c) != NULL) {
     if ((vga_switcheroo_handler_flags() & VGA_SWITCHEROO_CAN_SWITCH_DDC) && nv_connector->type == DCB_CONNECTOR_LVDS)
       nv_connector->edid = drm_get_edid_switcheroo(connector, i2c);
     else
       nv_connector->edid = drm_get_edid(connector, i2c);
-    drm_mode_connector_update_edid_property(connector, nv_connector->edid);
+    drm_connector_update_edid_property(connector, nv_connector->edid);
     if (!nv_connector->edid) {
       NV_ERROR(drm, "DDC responded, but no EDID for %s\n", connector->name);
       goto detect_analog;
     }
     /* Override encoder type for DVI-I based on whether EDID
      * says the display is digital or analog, both use the
      * same i2c channel so the value returned from ddc_detect
      * isn't necessarily correct.
      */
     nv_partner = NULL;
     if (nv_encoder->dcb->type == DCB_OUTPUT_TMDS) nv_partner = find_encoder(connector, DCB_OUTPUT_ANALOG);
     if (nv_encoder->dcb->type == DCB_OUTPUT_ANALOG) nv_partner = find_encoder(connector, DCB_OUTPUT_TMDS);
     if (nv_partner && ((nv_encoder->dcb->type == DCB_OUTPUT_ANALOG && nv_partner->dcb->type == DCB_OUTPUT_TMDS) || (nv_encoder->dcb->type == DCB_OUTPUT_TMDS && nv_partner->dcb->type == DCB_OUTPUT_ANALOG))) {
       if (nv_connector->edid->input & DRM_EDID_INPUT_DIGITAL)
         type = DCB_OUTPUT_TMDS;
       else
         type = DCB_OUTPUT_ANALOG;
       nv_encoder = find_encoder(connector, type);
     }
     nouveau_connector_set_encoder(connector, nv_encoder);
     conn_status = connector_status_connected;
     goto out;
   }
   nv_encoder = nouveau_connector_of_detect(connector);
   if (nv_encoder) {
     nouveau_connector_set_encoder(connector, nv_encoder);
     conn_status = connector_status_connected;
     goto out;
   }
 detect_analog:
   nv_encoder = find_encoder(connector, DCB_OUTPUT_ANALOG);
   if (!nv_encoder && !nouveau_tv_disable) nv_encoder = find_encoder(connector, DCB_OUTPUT_TV);
   if (nv_encoder && force) {
     struct drm_encoder *encoder = to_drm_encoder(nv_encoder);
     const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
     if (helper->detect(encoder, connector) == connector_status_connected) {
       nouveau_connector_set_encoder(connector, nv_encoder);
       conn_status = connector_status_connected;
       goto out;
     }
   }
 out:
   if (!drm_kms_helper_is_poll_worker()) {
     pm_runtime_mark_last_busy(connector->dev->dev);
     pm_runtime_put_autosuspend(connector->dev->dev);
   }
   return conn_status;
 }<sep>@@
expression e1,e2;
@@
-       drm_mode_connector_update_edid_property
+       drm_connector_update_edid_property
		(e1,e2)