Commit de1dc033 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Matt Roper
Browse files

drm/i915: Move intel_modeset_all_pipes() 



Move intel_modeset_all_pipes() to a central place so that we can
use it elsewhere as well. No functional changes.

Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarClinton Taylor <Clinton.A.Taylor@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210514153711.2359617-12-matthew.d.roper@intel.com
parent 57ed0dfb

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

+0 −38
Original line number Diff line number Diff line
@@ -2375,44 +2375,6 @@ static int bxt_modeset_calc_cdclk(struct intel_cdclk_state *cdclk_state) 
	return 0;

}



static int intel_modeset_all_pipes(struct intel_atomic_state *state)

{

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

	struct intel_crtc *crtc;



	/*

	 * Add all pipes to the state, and force

	 * a modeset on all the active ones.

	 */

	for_each_intel_crtc(&dev_priv->drm, crtc) {

		struct intel_crtc_state *crtc_state;

		int ret;



		crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);

		if (IS_ERR(crtc_state))

			return PTR_ERR(crtc_state);



		if (!crtc_state->hw.active ||

		    drm_atomic_crtc_needs_modeset(&crtc_state->uapi))

			continue;



		crtc_state->uapi.mode_changed = true;



		ret = drm_atomic_add_affected_connectors(&state->base,

							 &crtc->base);

		if (ret)

			return ret;



		ret = intel_atomic_add_affected_planes(state, crtc);

		if (ret)

			return ret;



		crtc_state->update_planes |= crtc_state->active_planes;

	}



	return 0;

}



static int fixed_modeset_calc_cdclk(struct intel_cdclk_state *cdclk_state)

{

	int min_cdclk;

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

+38 −0
Original line number Diff line number Diff line
@@ -9033,6 +9033,44 @@ intel_modeset_verify_disabled(struct drm_i915_private *dev_priv, 
	verify_disabled_dpll_state(dev_priv);

}



int intel_modeset_all_pipes(struct intel_atomic_state *state)

{

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

	struct intel_crtc *crtc;



	/*

	 * Add all pipes to the state, and force

	 * a modeset on all the active ones.

	 */

	for_each_intel_crtc(&dev_priv->drm, crtc) {

		struct intel_crtc_state *crtc_state;

		int ret;



		crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);

		if (IS_ERR(crtc_state))

			return PTR_ERR(crtc_state);



		if (!crtc_state->hw.active ||

		    drm_atomic_crtc_needs_modeset(&crtc_state->uapi))

			continue;



		crtc_state->uapi.mode_changed = true;



		ret = drm_atomic_add_affected_connectors(&state->base,

							 &crtc->base);

		if (ret)

			return ret;



		ret = intel_atomic_add_affected_planes(state, crtc);

		if (ret)

			return ret;



		crtc_state->update_planes |= crtc_state->active_planes;

	}



	return 0;

}



static void

intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915); 
void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915);

void intel_display_resume(struct drm_device *dev);

void intel_init_pch_refclk(struct drm_i915_private *dev_priv);

int intel_modeset_all_pipes(struct intel_atomic_state *state);



/* modesetting asserts */

void assert_panel_unlocked(struct drm_i915_private *dev_priv,