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

drm/i915: Simplify watermark state checker calling convention 



There is never any reason to pass in both the crtc and its state
as one can always dig out the crtc from its state. But for more
consistency across the whole state checker let's just pass the
overall atomic state+crtc here as well.

v2: Also pass state+crtc here (Jani)

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231005122713.3531-1-ville.syrjala@linux.intel.com
parent 487a2db8

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

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void intel_modeset_verify_crtc(struct intel_crtc *crtc, 
	    !intel_crtc_needs_fastset(new_crtc_state))

		return;



	intel_wm_state_verify(crtc, new_crtc_state);

	intel_wm_state_verify(state, crtc);

	verify_connector_state(state, crtc);

	verify_crtc_state(state, crtc);

	intel_shared_dpll_state_verify(state, crtc);

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

+5 −3
Original line number Diff line number Diff line
@@ -3134,10 +3134,12 @@ static void skl_wm_get_hw_state_and_sanitize(struct drm_i915_private *i915) 
	skl_wm_sanitize(i915);

}



void intel_wm_state_verify(struct intel_crtc *crtc,

			   const struct intel_crtc_state *new_crtc_state)

void intel_wm_state_verify(struct intel_atomic_state *state,

			   struct intel_crtc *crtc)

{

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

	struct drm_i915_private *i915 = to_i915(state->base.dev);

	const struct intel_crtc_state *new_crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	struct skl_hw_state {

		struct skl_ddb_entry ddb[I915_MAX_PLANES];

		struct skl_ddb_entry ddb_y[I915_MAX_PLANES];

drivers/gpu/drm/i915/display/skl_watermark.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb, 
				 const struct skl_ddb_entry *entries,

				 int num_entries, int ignore_idx);



void intel_wm_state_verify(struct intel_crtc *crtc,

			   const struct intel_crtc_state *new_crtc_state);

void intel_wm_state_verify(struct intel_atomic_state *state,

			   struct intel_crtc *crtc);



void skl_watermark_ipc_init(struct drm_i915_private *i915);

void skl_watermark_ipc_update(struct drm_i915_private *i915);