Re: [Intel-gfx] [PATCH v3 2/5] drm/i915/wm: warn about ilk_wm_sanitize() on display ver 9+

["Ville Syrjälä" <ville.syrjala@linux.intel.com>]

On Wed, Feb 15, 2023 at 04:19:07PM +0200, Jani Nikula wrote:
> The sanitization should be limited to PCH split platforms up to display
> version 8. Warn and bail out otherwise.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/i9xx_wm.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c
> index f76ac64ebd71..50cdfe11192e 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_wm.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c
> @@ -3437,6 +3437,9 @@ void ilk_wm_sanitize(struct drm_i915_private *dev_priv)
>  	if (!dev_priv->display.funcs.wm->optimize_watermarks)
>  		return;
>  
> +	if (drm_WARN_ON(&dev_priv->drm, DISPLAY_VER(dev_priv) >= 9))
> +		return;
> +

Oh you put it here. I guess that works too, though still
a bit confusing that we call an ilk_ thing on skl+.

Whatever you decide
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  	state = drm_atomic_state_alloc(&dev_priv->drm);
>  	if (drm_WARN_ON(&dev_priv->drm, !state))
>  		return;
> -- 
> 2.34.1

-- 
Ville Syrjälä
Intel