[Intel-gfx] [PATCH 2/4] drm/i915/crtc: replace I915_STATE_WARN_ON() with I915_STATE_WARN()

Rodrigo Vivi rodrigo.vivi at kernel.org
Fri May 12 14:13:44 UTC 2023


On Fri, May 12, 2023 at 02:04:42PM +0300, Jani Nikula wrote:
> Describe the assertion better.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_crtc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
> index df7d05f1e14b..1e3f88d00609 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -35,7 +35,9 @@
>  
>  static void assert_vblank_disabled(struct drm_crtc *crtc)
>  {
> -	if (I915_STATE_WARN_ON(drm_crtc_vblank_get(crtc) == 0))
> +	if (I915_STATE_WARN(drm_crtc_vblank_get(crtc) == 0,
> +			    "[CRTC:%d:%s] vblank assertion failure (expected off, current on)\n",
> +			    crtc->base.id, crtc->name))
>  		drm_crtc_vblank_put(crtc);
>  }
>  
> -- 
> 2.39.2
> 


More information about the Intel-gfx mailing list