[PATCH v7 13/13] drm/xe/device: Remove unused xe_device::usm::num_vm_in_*

[Matthew Brost]

On Wed, Aug 07, 2024 at 06:23:42PM +0200, Francois Dugast wrote:
> Those counters were used to keep track of the numbers VMs in fault mode
> and in non-fault mode, to determine if the whole device was in fault mode
> or not. This is no longer needed so remove those variables and their
> usages.
> 
> Signed-off-by: Francois Dugast <francois.dugast at intel.com>

Reviewed-by: Matthew Brost <matthew.brost at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_device.h       | 10 ----------
>  drivers/gpu/drm/xe/xe_device_types.h |  4 ----
>  drivers/gpu/drm/xe/xe_vm.c           | 12 ------------
>  3 files changed, 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_device.h b/drivers/gpu/drm/xe/xe_device.h
> index db6cc8d0d6b8..5551912da74e 100644
> --- a/drivers/gpu/drm/xe/xe_device.h
> +++ b/drivers/gpu/drm/xe/xe_device.h
> @@ -134,16 +134,6 @@ static inline struct xe_force_wake *gt_to_fw(struct xe_gt *gt)
>  
>  void xe_device_assert_mem_access(struct xe_device *xe);
>  
> -static inline bool xe_device_in_fault_mode(struct xe_device *xe)
> -{
> -	return xe->usm.num_vm_in_fault_mode != 0;
> -}
> -
> -static inline bool xe_device_in_non_fault_mode(struct xe_device *xe)
> -{
> -	return xe->usm.num_vm_in_non_fault_mode != 0;
> -}
> -
>  static inline bool xe_device_has_flat_ccs(struct xe_device *xe)
>  {
>  	return xe->info.has_flat_ccs;
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index 5b7292a9a66d..5fb39d991167 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -361,10 +361,6 @@ struct xe_device {
>  		struct xarray asid_to_vm;
>  		/** @usm.next_asid: next ASID, used to cyclical alloc asids */
>  		u32 next_asid;
> -		/** @usm.num_vm_in_fault_mode: number of VM in fault mode */
> -		u32 num_vm_in_fault_mode;
> -		/** @usm.num_vm_in_non_fault_mode: number of VM in non-fault mode */
> -		u32 num_vm_in_non_fault_mode;
>  		/** @usm.lock: protects UM state */
>  		struct mutex lock;
>  	} usm;
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 7a88c65759c9..d2001a08084b 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -1508,13 +1508,6 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
>  	if (number_tiles > 1)
>  		vm->composite_fence_ctx = dma_fence_context_alloc(1);
>  
> -	mutex_lock(&xe->usm.lock);
> -	if (flags & XE_VM_FLAG_FAULT_MODE)
> -		xe->usm.num_vm_in_fault_mode++;
> -	else if (!(flags & XE_VM_FLAG_MIGRATION))
> -		xe->usm.num_vm_in_non_fault_mode++;
> -	mutex_unlock(&xe->usm.lock);
> -
>  	trace_xe_vm_create(vm);
>  
>  	return vm;
> @@ -1628,11 +1621,6 @@ void xe_vm_close_and_put(struct xe_vm *vm)
>  	up_write(&vm->lock);
>  
>  	mutex_lock(&xe->usm.lock);
> -	if (vm->flags & XE_VM_FLAG_FAULT_MODE)
> -		xe->usm.num_vm_in_fault_mode--;
> -	else if (!(vm->flags & XE_VM_FLAG_MIGRATION))
> -		xe->usm.num_vm_in_non_fault_mode--;
> -
>  	if (vm->usm.asid) {
>  		void *lookup;
>  
> -- 
> 2.43.0
>