diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 304073a..5b428f5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14357,8 +14357,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
  unsigned crtc_vblank_mask = 0;
  int i;

- drm_atomic_helper_wait_for_dependencies(state);
-
  if (intel_state->modeset) {
    memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
           sizeof(intel_state->min_pixclk));
@@ -14481,8 +14479,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
  if (intel_state->modeset && intel_can_enable_sagv(state))
    intel_enable_sagv(dev_priv);

- drm_atomic_helper_commit_hw_done(state);
-
  if (intel_state->modeset)
    intel_display_power_put(dev_priv, POWER_DOMAIN_MODESET);

@@ -14490,8 +14486,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
  drm_atomic_helper_cleanup_planes(dev, state);
  mutex_unlock(&dev->struct_mutex);

- drm_atomic_helper_commit_cleanup_done(state);
-
  drm_atomic_state_put(state);

  /* As one of the primary mmio accessors, KMS has a high likelihood
@@ -14578,10 +14572,6 @@ static int intel_atomic_commit(struct drm_device *dev,
    return -EINVAL;
  }

- ret = drm_atomic_helper_setup_commit(state, nonblock);
- if (ret)
-   return ret;
-
  drm_atomic_state_get(state);
  i915_sw_fence_init(&intel_state->commit_ready,
         intel_atomic_commit_ready);
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 9f279a3..ca589ac 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -329,8 +329,6 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)

  if (IS_VALLEYVIEW(dev_priv))
    vlv_exec_gpio(dev_priv, gpio_source, gpio_index, value);
- else if (IS_CHERRYVIEW(dev_priv))
-   chv_exec_gpio(dev_priv, gpio_source, gpio_index, value);
  else
    DRM_DEBUG_KMS("GPIO element not supported on this platform\n");