--- initial
+++ final
@@ -1,93 +1,93 @@
 static bool intel_edp_init_connector(struct intel_dp *intel_dp, struct intel_connector *intel_connector) {
   struct drm_device *dev = intel_dp_to_dev(intel_dp);
   struct drm_i915_private *dev_priv = to_i915(dev);
   struct drm_connector *connector = &intel_connector->base;
   struct drm_display_mode *fixed_mode = NULL;
   struct drm_display_mode *downclock_mode = NULL;
   bool has_dpcd;
   struct drm_display_mode *scan;
   struct edid *edid;
   enum pipe pipe = INVALID_PIPE;
   if (!intel_dp_is_edp(intel_dp)) return true;
   /*
    * On IBX/CPT we may get here with LVDS already registered. Since the
    * driver uses the only internal power sequencer available for both
    * eDP and LVDS bail out early in this case to prevent interfering
    * with an already powered-on LVDS power sequencer.
    */
   if (intel_get_lvds_encoder(&dev_priv->drm)) {
     WARN_ON(!(HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv)));
     DRM_INFO("LVDS was detected, not registering eDP\n");
     return false;
   }
   pps_lock(intel_dp);
   intel_dp_init_panel_power_timestamps(intel_dp);
   intel_dp_pps_init(intel_dp);
   intel_edp_panel_vdd_sanitize(intel_dp);
   pps_unlock(intel_dp);
   /* Cache DPCD and EDID for edp. */
   has_dpcd = intel_edp_init_dpcd(intel_dp);
   if (!has_dpcd) {
     /* if this fails, presume the device is a ghost */
     DRM_INFO("failed to retrieve link info, disabling eDP\n");
     goto out_vdd_off;
   }
   mutex_lock(&dev->mode_config.mutex);
   edid = drm_get_edid(connector, &intel_dp->aux.ddc);
   if (edid) {
     if (drm_add_edid_modes(connector, edid)) {
-      drm_mode_connector_update_edid_property(connector, edid);
+      drm_connector_update_edid_property(connector, edid);
     } else {
       kfree(edid);
       edid = ERR_PTR(-EINVAL);
     }
   } else {
     edid = ERR_PTR(-ENOENT);
   }
   intel_connector->edid = edid;
   /* prefer fixed mode from EDID if available */
   list_for_each_entry(scan, &connector->probed_modes, head) {
     if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
       fixed_mode = drm_mode_duplicate(dev, scan);
       downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode);
       break;
     }
   }
   /* fallback to VBT if available for eDP */
   if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) {
     fixed_mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);
     if (fixed_mode) {
       fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
       connector->display_info.width_mm = fixed_mode->width_mm;
       connector->display_info.height_mm = fixed_mode->height_mm;
     }
   }
   mutex_unlock(&dev->mode_config.mutex);
   if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
     intel_dp->edp_notifier.notifier_call = edp_notify_handler;
     register_reboot_notifier(&intel_dp->edp_notifier);
     /*
      * Figure out the current pipe for the initial backlight setup.
      * If the current pipe isn't valid, try the PPS pipe, and if that
      * fails just assume pipe A.
      */
     pipe = vlv_active_pipe(intel_dp);
     if (pipe != PIPE_A && pipe != PIPE_B) pipe = intel_dp->pps_pipe;
     if (pipe != PIPE_A && pipe != PIPE_B) pipe = PIPE_A;
     DRM_DEBUG_KMS("using pipe %c for initial backlight setup\n", pipe_name(pipe));
   }
   intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
   intel_connector->panel.backlight.power = intel_edp_backlight_power;
   intel_panel_setup_backlight(connector, pipe);
   return true;
 out_vdd_off:
   cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
   /*
    * vdd might still be enabled do to the delayed vdd off.
    * Make sure vdd is actually turned off here.
    */
   pps_lock(intel_dp);
   edp_panel_vdd_off_sync(intel_dp);
   pps_unlock(intel_dp);
   return false;
 }<sep>@@
expression e1,e2;
@@
-       drm_mode_connector_update_edid_property
+       drm_connector_update_edid_property
		(e1,e2)