Re: [PATCH v10 07/20] drm/xe/vsec: Correct locking order

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Fri, Sep 18, 2026 at 06:17:58AM -0700, Michael J. Ruhl wrote:
> Xe locking order is power state first, and then local locks.
> 
> Reorder locking for correct usage.
> 
> Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>

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

> ---
>  drivers/gpu/drm/xe/xe_vsec.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
> index 481bcbcc6372..1b88ac1d2448 100644
> --- a/drivers/gpu/drm/xe/xe_vsec.c
> +++ b/drivers/gpu/drm/xe/xe_vsec.c
> @@ -157,16 +157,17 @@ int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offse
>  
>  	telem_addr += offset + user_offset;
>  
> -	guard(mutex)(&xe->pmt.lock);
> -
>  	/* indicate that we are not at an appropriate power level */
>  	if (!xe_pm_runtime_get_if_active(xe))
>  		return -ENODATA;
>  
> -	/* set SoC re-mapper index register based on GUID memory region */
> -	xe->soc_remapper.set_telem_region(xe, mem_region);
> +	scoped_guard(mutex, &xe->pmt.lock) {
> +		/* set SoC re-mapper index register based on GUID memory region */
> +		xe->soc_remapper.set_telem_region(xe, mem_region);
> +
> +		memcpy_fromio(data, telem_addr, count);
> +	}
>  
> -	memcpy_fromio(data, telem_addr, count);
>  	xe_pm_runtime_put(xe);
>  
>  	return count;
> -- 
> 2.43.0
>