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

drm/i915: s/crtc_state/new_crtc_state/ etc. 



intel_plane_atomic_calc_changes() deals with both the old and
new crtc/plane states. Make the variable names reflect that
more clearly.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210514125751.17075-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
parent e6e0edfd

drivers/gpu/drm/i915/display/intel_display.c

+19 −19
Original line number Diff line number Diff line
@@ -6362,27 +6362,27 @@ static bool needs_scaling(const struct intel_plane_state *state) 
}



int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_state,

				    struct intel_crtc_state *crtc_state,

				    struct intel_crtc_state *new_crtc_state,

				    const struct intel_plane_state *old_plane_state,

				    struct intel_plane_state *plane_state)

				    struct intel_plane_state *new_plane_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);

	struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);

	struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);

	bool mode_changed = intel_crtc_needs_modeset(crtc_state);

	bool mode_changed = intel_crtc_needs_modeset(new_crtc_state);

	bool was_crtc_enabled = old_crtc_state->hw.active;

	bool is_crtc_enabled = crtc_state->hw.active;

	bool is_crtc_enabled = new_crtc_state->hw.active;

	bool turn_off, turn_on, visible, was_visible;

	int ret;



	if (DISPLAY_VER(dev_priv) >= 9 && plane->id != PLANE_CURSOR) {

		ret = skl_update_scaler_plane(crtc_state, plane_state);

		ret = skl_update_scaler_plane(new_crtc_state, new_plane_state);

		if (ret)

			return ret;

	}



	was_visible = old_plane_state->uapi.visible;

	visible = plane_state->uapi.visible;

	visible = new_plane_state->uapi.visible;



	if (!was_crtc_enabled && drm_WARN_ON(&dev_priv->drm, was_visible))

		was_visible = false;
@@ -6398,7 +6398,7 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat 
	 * only combine the results from all planes in the current place?

	 */

	if (!is_crtc_enabled) {

		intel_plane_set_invisible(crtc_state, plane_state);

		intel_plane_set_invisible(new_crtc_state, new_plane_state);

		visible = false;

	}
@@ -6417,28 +6417,28 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat 


	if (turn_on) {

		if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv))

			crtc_state->update_wm_pre = true;

			new_crtc_state->update_wm_pre = true;



		/* must disable cxsr around plane enable/disable */

		if (plane->id != PLANE_CURSOR)

			crtc_state->disable_cxsr = true;

			new_crtc_state->disable_cxsr = true;

	} else if (turn_off) {

		if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv))

			crtc_state->update_wm_post = true;

			new_crtc_state->update_wm_post = true;



		/* must disable cxsr around plane enable/disable */

		if (plane->id != PLANE_CURSOR)

			crtc_state->disable_cxsr = true;

	} else if (intel_wm_need_update(old_plane_state, plane_state)) {

			new_crtc_state->disable_cxsr = true;

	} else if (intel_wm_need_update(old_plane_state, new_plane_state)) {

		if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv)) {

			/* FIXME bollocks */

			crtc_state->update_wm_pre = true;

			crtc_state->update_wm_post = true;

			new_crtc_state->update_wm_pre = true;

			new_crtc_state->update_wm_post = true;

		}

	}



	if (visible || was_visible)

		crtc_state->fb_bits |= plane->frontbuffer_bit;

		new_crtc_state->fb_bits |= plane->frontbuffer_bit;



	/*

	 * ILK/SNB DVSACNTR/Sprite Enable
@@ -6477,8 +6477,8 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat 
	    (IS_IRONLAKE(dev_priv) || IS_SANDYBRIDGE(dev_priv) ||

	     IS_IVYBRIDGE(dev_priv)) &&

	    (turn_on || (!needs_scaling(old_plane_state) &&

			 needs_scaling(plane_state))))

		crtc_state->disable_lp_wm = true;

			 needs_scaling(new_plane_state))))

		new_crtc_state->disable_lp_wm = true;



	return 0;

}