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

drm/i915: Extract intel_bw_modeset_checks() 



Pull the new_bw_state->active_pipes computation out from
intel_compute_sagv_mask() and move it into the intel_bw.c
(which is arguably the correct place for it).

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


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 67ad5b9b

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

+29 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,35 @@ static int intel_bw_check_data_rate(struct intel_atomic_state *state, bool *chan 
	return 0;

}



int intel_bw_modeset_checks(struct intel_atomic_state *state)

{

	struct intel_display *display = to_intel_display(state);

	const struct intel_bw_state *old_bw_state;

	struct intel_bw_state *new_bw_state;



	if (DISPLAY_VER(display) < 9)

		return 0;



	new_bw_state = intel_atomic_get_bw_state(state);

	if (IS_ERR(new_bw_state))

		return PTR_ERR(new_bw_state);



	old_bw_state = intel_atomic_get_old_bw_state(state);



	new_bw_state->active_pipes =

		intel_calc_active_pipes(state, old_bw_state->active_pipes);



	if (new_bw_state->active_pipes != old_bw_state->active_pipes) {

		int ret;



		ret = intel_atomic_lock_global_state(&new_bw_state->base);

		if (ret)

			return ret;

	}



	return 0;

}



int intel_bw_atomic_check(struct intel_atomic_state *state)

{

	struct intel_display *display = to_intel_display(state);

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

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ intel_atomic_get_bw_state(struct intel_atomic_state *state); 


void intel_bw_init_hw(struct intel_display *display);

int intel_bw_init(struct intel_display *display);

int intel_bw_modeset_checks(struct intel_atomic_state *state);

int intel_bw_atomic_check(struct intel_atomic_state *state);

int icl_pcode_restrict_qgv_points(struct intel_display *display,

				  u32 points_mask);

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

+6 −0
Original line number Diff line number Diff line
@@ -6443,6 +6443,12 @@ int intel_atomic_check(struct drm_device *dev, 
	if (ret)

		goto fail;



	if (any_ms) {

		ret = intel_bw_modeset_checks(state);

		if (ret)

			goto fail;

	}



	ret = intel_compute_global_watermarks(state);

	if (ret)

		goto fail;

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

+0 −9
Original line number Diff line number Diff line
@@ -501,15 +501,6 @@ static int intel_compute_sagv_mask(struct intel_atomic_state *state) 
	if (!new_bw_state)

		return 0;



	new_bw_state->active_pipes =

		intel_calc_active_pipes(state, old_bw_state->active_pipes);



	if (new_bw_state->active_pipes != old_bw_state->active_pipes) {

		ret = intel_atomic_lock_global_state(&new_bw_state->base);

		if (ret)

			return ret;

	}



	if (intel_can_enable_sagv(i915, new_bw_state) !=

	    intel_can_enable_sagv(i915, old_bw_state)) {

		ret = intel_atomic_serialize_global_state(&new_bw_state->base);