[PATCH i-g-t v3 03/14] lib/xe_ioctl: Add wrapper with vm_bind_op extension parameter

[Zbigniew Kempczyński]

On Fri, Aug 09, 2024 at 02:38:02PM +0200, Christoph Manszewski wrote:
> Currently there is no way to set drm_xe_vm_bind_op extension field. Add
> vm_bind wrapper that allows pass this field as a parameter.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> Signed-off-by: Christoph Manszewski <christoph.manszewski at intel.com>
> Reviewed-by: Dominik Karol Piątkowski <dominik.karol.piatkowski at intel.com>
> ---
>  lib/xe/xe_ioctl.c | 20 ++++++++++++++++----
>  lib/xe/xe_ioctl.h |  5 +++++
>  2 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/xe/xe_ioctl.c b/lib/xe/xe_ioctl.c
> index ae43ffd15..6d8388918 100644
> --- a/lib/xe/xe_ioctl.c
> +++ b/lib/xe/xe_ioctl.c
> @@ -96,15 +96,17 @@ void xe_vm_bind_array(int fd, uint32_t vm, uint32_t exec_queue,
>  	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_VM_BIND, &bind), 0);
>  }
>  
> -int  __xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
> -		  uint64_t offset, uint64_t addr, uint64_t size, uint32_t op,
> -		  uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs,
> -		  uint32_t prefetch_region, uint8_t pat_index, uint64_t ext)
> +int  ___xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
> +		   uint64_t offset, uint64_t addr, uint64_t size, uint32_t op,
> +		   uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs,
> +		   uint32_t prefetch_region, uint8_t pat_index, uint64_t ext,
> +		   uint64_t op_ext)
>  {
>  	struct drm_xe_vm_bind bind = {
>  		.extensions = ext,
>  		.vm_id = vm,
>  		.num_binds = 1,
> +		.bind.extensions = op_ext,
>  		.bind.obj = bo,
>  		.bind.obj_offset = offset,
>  		.bind.range = size,
> @@ -125,6 +127,16 @@ int  __xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
>  	return 0;
>  }
>  
> +int  __xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
> +		  uint64_t offset, uint64_t addr, uint64_t size, uint32_t op,
> +		  uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs,
> +		  uint32_t prefetch_region, uint8_t pat_index, uint64_t ext)
> +{
> +	return ___xe_vm_bind(fd, vm, exec_queue, bo, offset, addr, size, op,
> +			     flags, sync, num_syncs, prefetch_region,
> +			     pat_index, ext, 0);
> +}
> +
>  void  __xe_vm_bind_assert(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
>  			  uint64_t offset, uint64_t addr, uint64_t size,
>  			  uint32_t op, uint32_t flags, struct drm_xe_sync *sync,
> diff --git a/lib/xe/xe_ioctl.h b/lib/xe/xe_ioctl.h
> index b27c0053f..18cc2b72b 100644
> --- a/lib/xe/xe_ioctl.h
> +++ b/lib/xe/xe_ioctl.h
> @@ -20,6 +20,11 @@
>  uint32_t xe_cs_prefetch_size(int fd);
>  uint64_t xe_bb_size(int fd, uint64_t reqsize);
>  uint32_t xe_vm_create(int fd, uint32_t flags, uint64_t ext);
> +int  ___xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
> +		   uint64_t offset, uint64_t addr, uint64_t size, uint32_t op,
> +		   uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs,
> +		   uint32_t prefetch_region, uint8_t pat_index, uint64_t ext,
> +		   uint64_t op_ext);
>  int  __xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo,
>  		  uint64_t offset, uint64_t addr, uint64_t size, uint32_t op,
>  		  uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs,
> -- 
> 2.34.1
> 

Ok, this is harmless and doesn't depend on eudebug uapi headers.

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew