[Intel-gfx] [PATCH 3/7] drm/i915/display: use common function for checking scanline is moving

[Murthy, Arun R]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Monday, December 12, 2022 7:59 PM
> To: intel-gfx at lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula at intel.com>
> Subject: [Intel-gfx] [PATCH 3/7] drm/i915/display: use common function for
> checking scanline is moving
> 
> cpt_verify_modeset() is roughly the same as
> intel_wait_for_pipe_scanline_moving(). Assume it's close enough.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
Reviewed-by: Arun R Murthy <arun.r.murthy at intel.com>

Thanks and Regards,
Arun R Murthy
--------------------
>  drivers/gpu/drm/i915/display/intel_display.c | 18 +-----------------
>  1 file changed, 1 insertion(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 0cdb514d7ee0..ef15cc2b1fa9 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -1062,22 +1062,6 @@ intel_get_crtc_new_encoder(const struct
> intel_atomic_state *state,
>  	return encoder;
>  }
> 
> -static void cpt_verify_modeset(struct drm_i915_private *dev_priv,
> -			       enum pipe pipe)
> -{
> -	i915_reg_t dslreg = PIPEDSL(pipe);
> -	u32 temp;
> -
> -	temp = intel_de_read(dev_priv, dslreg);
> -	udelay(500);
> -	if (wait_for(intel_de_read(dev_priv, dslreg) != temp, 5)) {
> -		if (wait_for(intel_de_read(dev_priv, dslreg) != temp, 5))
> -			drm_err(&dev_priv->drm,
> -				"mode set failed: pipe %c stuck\n",
> -				pipe_name(pipe));
> -	}
> -}
> -
>  static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state)  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> @@ -1772,7 +1756,7 @@ static void ilk_crtc_enable(struct
> intel_atomic_state *state,
>  	intel_encoders_enable(state, crtc);
> 
>  	if (HAS_PCH_CPT(dev_priv))
> -		cpt_verify_modeset(dev_priv, pipe);
> +		intel_wait_for_pipe_scanline_moving(crtc);
> 
>  	/*
>  	 * Must wait for vblank to avoid spurious PCH FIFO underruns.
> --
> 2.34.1