[PATCH 2/2] drm/xe: Use xe_bo_lock()/xe_bo_unlock() helpers

Matthew Brost matthew.brost at intel.com
Wed Apr 24 03:55:49 UTC 2024


On Wed, Apr 24, 2024 at 09:27:56AM +0530, Himal Prasad Ghimiray wrote:
> There is no change in functionality. Using the helper function
> defined within the driver for locking/unlocking the reservation
> object.
> 
> Cc: Matthew Brost <matthew.brost at intel.com>
> Cc: Ashutosh Dixit <ashutosh.dixit at intel.com>
> Suggested-by: Matthew Brost <matthew.brost at intel.com>

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

> Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_lrc.c | 4 ++--
>  drivers/gpu/drm/xe/xe_vm.c  | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
> index 615bbc372ac6..2066d34ddf0b 100644
> --- a/drivers/gpu/drm/xe/xe_lrc.c
> +++ b/drivers/gpu/drm/xe/xe_lrc.c
> @@ -1382,7 +1382,7 @@ void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
>  	if (!snapshot->lrc_snapshot)
>  		goto put_bo;
>  
> -	dma_resv_lock(bo->ttm.base.resv, NULL);
> +	xe_bo_lock(bo, false);
>  	if (!ttm_bo_vmap(&bo->ttm, &src)) {
>  		xe_map_memcpy_from(xe_bo_device(bo),
>  				   snapshot->lrc_snapshot, &src, snapshot->lrc_offset,
> @@ -1392,7 +1392,7 @@ void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
>  		kvfree(snapshot->lrc_snapshot);
>  		snapshot->lrc_snapshot = NULL;
>  	}
> -	dma_resv_unlock(bo->ttm.base.resv);
> +	xe_bo_unlock(bo);
>  put_bo:
>  	xe_bo_put(bo);
>  }
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index c350c561e7d9..6606e2a32e2b 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -3335,7 +3335,7 @@ void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
>  		}
>  
>  		if (bo) {
> -			dma_resv_lock(bo->ttm.base.resv, NULL);
> +			xe_bo_lock(bo, false);
>  			err = ttm_bo_vmap(&bo->ttm, &src);
>  			if (!err) {
>  				xe_map_memcpy_from(xe_bo_device(bo),
> @@ -3344,7 +3344,7 @@ void xe_vm_snapshot_capture_delayed(struct xe_vm_snapshot *snap)
>  						   snap->snap[i].len);
>  				ttm_bo_vunmap(&bo->ttm, &src);
>  			}
> -			dma_resv_unlock(bo->ttm.base.resv);
> +			xe_bo_unlock(bo);
>  		} else {
>  			void __user *userptr = (void __user *)(size_t)snap->snap[i].bo_ofs;
>  
> -- 
> 2.25.1
> 


More information about the Intel-xe mailing list