Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

[cascardo/linux.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f3a3d68..095f83e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13728,7 +13728,7 @@ static int intel_atomic_commit(struct drm_device *dev,
                return ret;
        }
 
-       drm_atomic_helper_swap_state(dev, state);
+       drm_atomic_helper_swap_state(state, true);
        dev_priv->wm.distrust_bios_wm = false;
        dev_priv->wm.skl_results = intel_state->wm_results;
        intel_shared_dpll_commit(state);
@@ -16281,14 +16281,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
        intel_teardown_gmbus(dev);
 }
 
-/*
- * Return which encoder is currently attached for connector.
- */
-struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
-{
-       return &intel_attached_encoder(connector)->base;
-}
-
 void intel_connector_attach_encoder(struct intel_connector *connector,
                                    struct intel_encoder *encoder)
 {