Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c5e19f8 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: move swap state to the right place 



This is a preparation for passing crtc state to the helpers.
When converting all users of crtc->config to use the old or
new state it's easier to find regressions when swap_state is
done first.

If crtc->config is swapped at the same place as swap_state
bugs will never be found.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 06ea0b08

drivers/gpu/drm/i915/intel_display.c

+3 −2
Original line number Diff line number Diff line
@@ -12189,7 +12189,6 @@ intel_modeset_update_state(struct drm_atomic_state *state) 
	struct drm_connector *connector;



	intel_shared_dpll_commit(state);

	drm_atomic_helper_swap_state(state->dev, state);



	for_each_intel_encoder(dev, intel_encoder) {

		if (!intel_encoder->base.crtc)
@@ -12887,8 +12886,10 @@ static int __intel_set_mode(struct drm_atomic_state *state) 
	if (ret)

		return ret;



	drm_atomic_helper_swap_state(dev, state);



	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		if (!needs_modeset(crtc_state) || !crtc->state->active)

		if (!needs_modeset(crtc->state) || !crtc_state->active)

			continue;



		intel_crtc_disable_planes(crtc);