[Intel-gfx] [PATCH 10/19] drm/i915: Make .modeset_calc_cdclk() mandatory

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Thu Sep 19 11:01:38 UTC 2019


Op 08-07-2019 om 14:53 schreef Ville Syrjala:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> While not all platforms allow us to change the cdclk frequency
> we should still verify that the fixed cdclk frequency isn't
> too low. To that end let's cook up a .modeset_calc_cdclk()
> implementation that only does the min_cdclk vs. actual cdclk
> frequency check for such platforms.
>
> Also we mustn't forget about double wide pipe on gen2/3 when
> doing this.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_cdclk.c   | 31 ++++++++++++++++----
>  drivers/gpu/drm/i915/display/intel_display.c |  8 ++---
>  2 files changed, 28 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index f2910c0c3e3e..4649485fee33 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -2209,9 +2209,11 @@ intel_set_cdclk_post_plane_update(struct drm_i915_private *dev_priv,
>  		intel_set_cdclk(dev_priv, new_state, pipe);
>  }
>  
> -static int intel_pixel_rate_to_cdclk(struct drm_i915_private *dev_priv,
> -				     int pixel_rate)
> +static int intel_pixel_rate_to_cdclk(const struct intel_crtc_state *crtc_state)
>  {
> +	struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev);
> +	int pixel_rate = crtc_state->pixel_rate;
> +
>  	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
>  		return DIV_ROUND_UP(pixel_rate, 2);
>  	else if (IS_GEN(dev_priv, 9) ||
> @@ -2219,6 +2221,8 @@ static int intel_pixel_rate_to_cdclk(struct drm_i915_private *dev_priv,
>  		return pixel_rate;
>  	else if (IS_CHERRYVIEW(dev_priv))
>  		return DIV_ROUND_UP(pixel_rate * 100, 95);
> +	else if (crtc_state->double_wide)
> +		return DIV_ROUND_UP(pixel_rate * 100, 90 * 2);
>  	else
>  		return DIV_ROUND_UP(pixel_rate * 100, 90);
>  }
> @@ -2232,7 +2236,7 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state)
>  	if (!crtc_state->base.enable)
>  		return 0;
>  
> -	min_cdclk = intel_pixel_rate_to_cdclk(dev_priv, crtc_state->pixel_rate);
> +	min_cdclk = intel_pixel_rate_to_cdclk(crtc_state);
>  
>  	/* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
>  	if (IS_BROADWELL(dev_priv) && hsw_crtc_state_ips_capable(crtc_state))
> @@ -2647,15 +2651,28 @@ static int icl_modeset_calc_cdclk(struct intel_atomic_state *state)
>  	return 0;
>  }
>  
> +static int fixed_modeset_calc_cdclk(struct intel_atomic_state *state)
> +{
> +	int min_cdclk;
> +
> +	/*
> +	 * We can't change the cdclk frequency, but we still want to
> +	 * check that the required minimum frequency doesn't exceed
> +	 * the actual cdclk frequency.
> +	 */
> +	min_cdclk = intel_compute_min_cdclk(state);
> +	if (min_cdclk < 0)
> +		return min_cdclk;
> +
> +	return 0;
> +}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> +
>  int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(state->base.dev);
>  	enum pipe pipe;
>  	int ret;
>  
> -	if (!dev_priv->display.modeset_calc_cdclk)
> -		return 0;
> -
>  	ret = dev_priv->display.modeset_calc_cdclk(state);
>  	if (ret)
>  		return ret;
> @@ -2957,6 +2974,8 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
>  	} else if (IS_VALLEYVIEW(dev_priv)) {
>  		dev_priv->display.set_cdclk = vlv_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk = vlv_modeset_calc_cdclk;
> +	} else {
> +		dev_priv->display.modeset_calc_cdclk = fixed_modeset_calc_cdclk;
>  	}
>  
>  	if (INTEL_GEN(dev_priv) >= 11)
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 5a42cbfa72c3..2d3cfdc80fd3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -16701,11 +16701,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
>  
>  			intel_crtc_compute_pixel_rate(crtc_state);
>  
> -			if (dev_priv->display.modeset_calc_cdclk) {
> -				min_cdclk = intel_crtc_compute_min_cdclk(crtc_state);
> -				if (WARN_ON(min_cdclk < 0))
> -					min_cdclk = 0;
> -			}
> +			min_cdclk = intel_crtc_compute_min_cdclk(crtc_state);
> +			if (WARN_ON(min_cdclk < 0))
> +				min_cdclk = 0;
>  
>  			drm_calc_timestamping_constants(&crtc->base,
>  							&crtc_state->base.adjusted_mode);




More information about the dri-devel mailing list