Re: [PATCH 3/8] drm/i915/de: Flatten the unclaimed mmio code

[Jani Nikula <jani.nikula@linux.intel.com>]

On Fri, 13 Nov 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> The unclaimed register access code is nested a few
> too many levels to my linking in places. Flatten it
> all out to make it a bit nicer.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_de.c | 51 ++++++++++++++-----------
>  1 file changed, 29 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_de.c b/drivers/gpu/drm/i915/display/intel_de.c
> index 8a94f3f1d3ee..06d91570bee2 100644
> --- a/drivers/gpu/drm/i915/display/intel_de.c
> +++ b/drivers/gpu/drm/i915/display/intel_de.c
> @@ -250,11 +250,13 @@ static void check_unclaimed_mmio_pre(struct intel_display *display,
>  	if (!display->params.mmio_debug)
>  		return;
>  
> -	if (display->mmio.funcs->check_for_unclaimed_mmio(display))
> -		drm_dbg_kms(display->drm,
> -			    "Unclaimed access detected before %s register 0x%x\n",
> -			    write ? "write to" : "read from",
> -			    i915_mmio_reg_offset(reg));
> +	if (!display->mmio.funcs->check_for_unclaimed_mmio(display))
> +		return;
> +
> +	drm_dbg_kms(display->drm,
> +		    "Unclaimed access detected before %s register 0x%x\n",
> +		    write ? "write to" : "read from",
> +		    i915_mmio_reg_offset(reg));
>  }
>  
>  static void check_unclaimed_mmio_post(struct intel_display *display,
> @@ -265,13 +267,16 @@ static void check_unclaimed_mmio_post(struct intel_display *display,
>  	if (!display->params.mmio_debug)
>  		return;
>  
> -	if (drm_WARN(display->drm,
> -		     display->mmio.funcs->check_for_unclaimed_mmio(display),
> -		     "Unclaimed %s register 0x%x\n",
> -		     write ? "write to" : "read from",
> -		     i915_mmio_reg_offset(reg)))
> -		/* Only report the first N failures */
> -		display->params.mmio_debug--;
> +	if (!display->mmio.funcs->check_for_unclaimed_mmio(display))
> +		return;
> +
> +	drm_WARN(display->drm, true,
> +		 "Unclaimed %s register 0x%x\n",
> +		 write ? "write to" : "read from",
> +		 i915_mmio_reg_offset(reg));
> +
> +	/* Only report the first N failures */
> +	display->params.mmio_debug--;
>  }
>  
>  bool intel_de_unclaimed_mmio_detected(struct intel_display *display)
> @@ -300,18 +305,20 @@ bool intel_de_arm_unclaimed_mmio_detection(struct intel_display *display)
>  	if (display->mmio.unclaimed_mmio_check <= 0)
>  		goto out;
>  
> -	if (display->mmio.funcs->check_for_unclaimed_mmio(display)) {
> -		if (!display->params.mmio_debug) {
> -			drm_dbg_kms(display->drm,
> -				    "Unclaimed register detected, "
> -				    "enabling oneshot unclaimed register reporting. "
> -				    "Please use i915.mmio_debug=N for more information.\n");
> -			display->params.mmio_debug++;
> -		}
> -		display->mmio.unclaimed_mmio_check--;
> -		ret = true;
> +	if (!display->mmio.funcs->check_for_unclaimed_mmio(display))
> +		goto out;
> +
> +	if (!display->params.mmio_debug) {
> +		drm_dbg_kms(display->drm,
> +			    "Unclaimed register detected, "
> +			    "enabling oneshot unclaimed register reporting. "
> +			    "Please use i915.mmio_debug=N for more information.\n");
> +		display->params.mmio_debug++;
>  	}
>  
> +	display->mmio.unclaimed_mmio_check--;
> +	ret = true;
> +
>  out:
>  	spin_unlock_irq(&display->mmio.lock);

-- 
Jani Nikula, Intel