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

drm/i915: s/dev_priv/i915/ in the state checker 



Switch the state checker over to using the new 'i915' variable
name insteda of the old 'dev_priv'.

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


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

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

+17 −17
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ verify_connector_state(struct intel_atomic_state *state, 


static void intel_pipe_config_sanity_check(const struct intel_crtc_state *crtc_state)

{

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

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



	if (crtc_state->has_pch_encoder) {

		int fdi_dotclock = intel_dotclock_calculate(intel_fdi_link_freq(dev_priv, crtc_state),

		int fdi_dotclock = intel_dotclock_calculate(intel_fdi_link_freq(i915, crtc_state),

							    &crtc_state->fdi_m_n);

		int dotclock = crtc_state->hw.adjusted_mode.crtc_clock;
@@ -100,7 +100,7 @@ static void intel_pipe_config_sanity_check(const struct intel_crtc_state *crtc_s 
		 * Yell if the encoder disagrees. Allow for slight

		 * rounding differences.

		 */

		drm_WARN(&dev_priv->drm, abs(fdi_dotclock - dotclock) > 1,

		drm_WARN(&i915->drm, abs(fdi_dotclock - dotclock) > 1,

			 "FDI dotclock and encoder dotclock mismatch, fdi: %i, encoder: %i\n",

			 fdi_dotclock, dotclock);

	}
@@ -109,17 +109,17 @@ static void intel_pipe_config_sanity_check(const struct intel_crtc_state *crtc_s 
static void

verify_encoder_state(struct intel_atomic_state *state)

{

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

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

	struct intel_encoder *encoder;

	struct drm_connector *connector;

	const struct drm_connector_state *old_conn_state, *new_conn_state;

	int i;



	for_each_intel_encoder(&dev_priv->drm, encoder) {

	for_each_intel_encoder(&i915->drm, encoder) {

		bool enabled = false, found = false;

		enum pipe pipe;



		drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s]\n",

		drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s]\n",

			    encoder->base.base.id,

			    encoder->base.name);
@@ -134,7 +134,7 @@ verify_encoder_state(struct intel_atomic_state *state) 
			found = true;

			enabled = true;



			I915_STATE_WARN(dev_priv,

			I915_STATE_WARN(i915,

					new_conn_state->crtc != encoder->base.crtc,

					"connector's crtc doesn't match encoder crtc\n");

		}
@@ -142,7 +142,7 @@ verify_encoder_state(struct intel_atomic_state *state) 
		if (!found)

			continue;



		I915_STATE_WARN(dev_priv, !!encoder->base.crtc != enabled,

		I915_STATE_WARN(i915, !!encoder->base.crtc != enabled,

				"encoder's enabled state mismatch (expected %i, found %i)\n",

				!!encoder->base.crtc, enabled);
@@ -150,7 +150,7 @@ verify_encoder_state(struct intel_atomic_state *state) 
			bool active;



			active = encoder->get_hw_state(encoder, &pipe);

			I915_STATE_WARN(dev_priv, active,

			I915_STATE_WARN(i915, active,

					"encoder detached but still enabled on pipe %c.\n",

					pipe_name(pipe));

		}
@@ -162,7 +162,7 @@ verify_crtc_state(struct intel_atomic_state *state, 
		  struct intel_crtc *crtc)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_private *i915 = to_i915(dev);

	const struct intel_crtc_state *sw_crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	struct intel_crtc_state *hw_crtc_state;
@@ -173,7 +173,7 @@ verify_crtc_state(struct intel_atomic_state *state, 
	if (!hw_crtc_state)

		return;



	drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s]\n", crtc->base.base.id,

	drm_dbg_kms(&i915->drm, "[CRTC:%d:%s]\n", crtc->base.base.id,

		    crtc->base.name);



	hw_crtc_state->hw.enable = sw_crtc_state->hw.enable;
@@ -181,15 +181,15 @@ verify_crtc_state(struct intel_atomic_state *state, 
	intel_crtc_get_pipe_config(hw_crtc_state);



	/* we keep both pipes enabled on 830 */

	if (IS_I830(dev_priv) && hw_crtc_state->hw.active)

	if (IS_I830(i915) && hw_crtc_state->hw.active)

		hw_crtc_state->hw.active = sw_crtc_state->hw.active;



	I915_STATE_WARN(dev_priv,

	I915_STATE_WARN(i915,

			sw_crtc_state->hw.active != hw_crtc_state->hw.active,

			"crtc active state doesn't match with hw state (expected %i, found %i)\n",

			sw_crtc_state->hw.active, hw_crtc_state->hw.active);



	I915_STATE_WARN(dev_priv, crtc->active != sw_crtc_state->hw.active,

	I915_STATE_WARN(i915, crtc->active != sw_crtc_state->hw.active,

			"transitional active state does not match atomic hw state (expected %i, found %i)\n",

			sw_crtc_state->hw.active, crtc->active);
@@ -200,12 +200,12 @@ verify_crtc_state(struct intel_atomic_state *state, 
		bool active;



		active = encoder->get_hw_state(encoder, &pipe);

		I915_STATE_WARN(dev_priv, active != sw_crtc_state->hw.active,

		I915_STATE_WARN(i915, active != sw_crtc_state->hw.active,

				"[ENCODER:%i] active %i with crtc active %i\n",

				encoder->base.base.id, active,

				sw_crtc_state->hw.active);



		I915_STATE_WARN(dev_priv, active && master_crtc->pipe != pipe,

		I915_STATE_WARN(i915, active && master_crtc->pipe != pipe,

				"Encoder connected to wrong pipe %c\n",

				pipe_name(pipe));
@@ -220,7 +220,7 @@ verify_crtc_state(struct intel_atomic_state *state, 


	if (!intel_pipe_config_compare(sw_crtc_state,

				       hw_crtc_state, false)) {

		I915_STATE_WARN(dev_priv, 1, "pipe state doesn't match!\n");

		I915_STATE_WARN(i915, 1, "pipe state doesn't match!\n");

		intel_crtc_state_dump(hw_crtc_state, NULL, "hw state");

		intel_crtc_state_dump(sw_crtc_state, NULL, "sw state");

	}