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

Commit 21794813 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Eliminate crtc->state usage from intel_atomic_commit_tail and .crtc_update() 



We already have the correct new crtc state so just use that instead of
crtc->state.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170823152226.22938-7-ville.syrjala@linux.intel.com
parent 1a15b77b

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -12281,7 +12281,7 @@ static void skl_update_crtcs(struct drm_atomic_state *state, 
			unsigned int cmask = drm_crtc_mask(crtc);



			intel_crtc = to_intel_crtc(crtc);

			cstate = to_intel_crtc_state(crtc->state);

			cstate = to_intel_crtc_state(new_crtc_state);

			pipe = intel_crtc->pipe;



			if (updated & cmask || !cstate->base.active)
@@ -12410,7 +12410,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) 
			intel_check_cpu_fifo_underruns(dev_priv);

			intel_check_pch_fifo_underruns(dev_priv);



			if (!crtc->state->active) {

			if (!new_crtc_state->active) {

				/*

				 * Make sure we don't call initial_watermarks

				 * for ILK-style watermark updates.
@@ -12419,7 +12419,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) 
				 */

				if (INTEL_GEN(dev_priv) >= 9)

					dev_priv->display.initial_watermarks(intel_state,

									     to_intel_crtc_state(crtc->state));

									     to_intel_crtc_state(new_crtc_state));

			}

		}

	}