[PATCH v2 03/11] drm/xe: s/tlb_invalidation.lock/tlb_invalidation.fence_lock

Nirmoy Das nirmoy.das at linux.intel.com
Tue Jul 9 15:57:44 UTC 2024


On 7/8/2024 6:03 AM, Matthew Brost wrote:
> tlb_invalidation.lock is the lock for GT TLB invalidation fences, name
> this accurately.
>
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das at intel.com>
> ---
>   drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 8 ++++----
>   drivers/gpu/drm/xe/xe_gt_types.h            | 4 ++--
>   2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> index 687214d07ac7..147840b66ba9 100644
> --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
> @@ -80,7 +80,7 @@ int xe_gt_tlb_invalidation_init(struct xe_gt *gt)
>   	gt->tlb_invalidation.seqno = 1;
>   	INIT_LIST_HEAD(&gt->tlb_invalidation.pending_fences);
>   	spin_lock_init(&gt->tlb_invalidation.pending_lock);
> -	spin_lock_init(&gt->tlb_invalidation.lock);
> +	spin_lock_init(&gt->tlb_invalidation.fence_lock);
>   	INIT_DELAYED_WORK(&gt->tlb_invalidation.fence_tdr,
>   			  xe_gt_tlb_fence_timeout);
>   
> @@ -491,11 +491,11 @@ static const struct dma_fence_ops invalidation_fence_ops = {
>   void xe_gt_tlb_invalidation_fence_init(struct xe_gt *gt,
>   				       struct xe_gt_tlb_invalidation_fence *fence)
>   {
> -	spin_lock_irq(&gt->tlb_invalidation.lock);
> +	spin_lock_irq(&gt->tlb_invalidation.fence_lock);
>   	dma_fence_init(&fence->base, &invalidation_fence_ops,
> -		       &gt->tlb_invalidation.lock,
> +		       &gt->tlb_invalidation.fence_lock,
>   		       dma_fence_context_alloc(1), 1);
> -	spin_unlock_irq(&gt->tlb_invalidation.lock);
> +	spin_unlock_irq(&gt->tlb_invalidation.fence_lock);
>   	INIT_LIST_HEAD(&fence->link);
>   	dma_fence_get(&fence->base);
>   }
> diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
> index 6b5e0b45efb0..d190a66514c0 100644
> --- a/drivers/gpu/drm/xe/xe_gt_types.h
> +++ b/drivers/gpu/drm/xe/xe_gt_types.h
> @@ -192,8 +192,8 @@ struct xe_gt {
>   		 * xe_gt_tlb_fence_timeout after the timeut interval is over.
>   		 */
>   		struct delayed_work fence_tdr;
> -		/** @tlb_invalidation.lock: protects TLB invalidation fences */
> -		spinlock_t lock;
> +		/** @tlb_invalidation.fence_lock: protects TLB invalidation fences */
> +		spinlock_t fence_lock;
>   	} tlb_invalidation;
>   
>   	/**


More information about the Intel-xe mailing list