[PATCH libdrm v2 1/2] amdgpu: Add wrappers for AMDGPU_VM IOCTL.

[Christian König]

Am 27.10.2017 um 17:09 schrieb Andrey Grodzovsky:
> From: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>
>
> v2:
> Rename wrappers to match the IOCTL naming, fix
> identation and fix make check error.
>
> Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com> for both.

> ---
>   amdgpu/Makefile.sources    |  1 +
>   amdgpu/amdgpu-symbol-check |  2 ++
>   amdgpu/amdgpu.h            | 18 +++++++++++++++++
>   amdgpu/amdgpu_vm.c         | 50 ++++++++++++++++++++++++++++++++++++++++++++++
>   4 files changed, 71 insertions(+)
>   create mode 100644 amdgpu/amdgpu_vm.c
>
> diff --git a/amdgpu/Makefile.sources b/amdgpu/Makefile.sources
> index bc3abaa..498b64c 100644
> --- a/amdgpu/Makefile.sources
> +++ b/amdgpu/Makefile.sources
> @@ -6,6 +6,7 @@ LIBDRM_AMDGPU_FILES := \
>   	amdgpu_gpu_info.c \
>   	amdgpu_internal.h \
>   	amdgpu_vamgr.c \
> +	amdgpu_vm.c \
>   	util_hash.c \
>   	util_hash.h \
>   	util_hash_table.c \
> diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
> index 095c3a0..d476038 100755
> --- a/amdgpu/amdgpu-symbol-check
> +++ b/amdgpu/amdgpu-symbol-check
> @@ -64,6 +64,8 @@ amdgpu_read_mm_registers
>   amdgpu_va_range_alloc
>   amdgpu_va_range_free
>   amdgpu_va_range_query
> +amdgpu_vm_reserve_vmid
> +amdgpu_vm_unreserve_vmid
>   EOF
>   done)
>   
> diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
> index ecc975f..597fc2b 100644
> --- a/amdgpu/amdgpu.h
> +++ b/amdgpu/amdgpu.h
> @@ -1489,6 +1489,24 @@ void amdgpu_cs_chunk_fence_to_dep(struct amdgpu_cs_fence *fence,
>   void amdgpu_cs_chunk_fence_info_to_data(struct amdgpu_cs_fence_info *fence_info,
>   					struct drm_amdgpu_cs_chunk_data *data);
>   
> +/**
> + * Reserve VMID
> + * \param   context - \c [in]  GPU Context
> + * \param   flags - \c [in]  TBD
> + *
> + * \return  0 on success otherwise POSIX Error code
> +*/
> +int amdgpu_vm_reserve_vmid(amdgpu_context_handle context, uint32_t flags);
> +
> +/**
> + * Free reserved VMID
> + * \param   context - \c [in]  GPU Context
> + * \param   flags - \c [in]  TBD
> + *
> + * \return  0 on success otherwise POSIX Error code
> +*/
> +int amdgpu_vm_unreserve_vmid(amdgpu_context_handle context, uint32_t flags);
> +
>   #ifdef __cplusplus
>   }
>   #endif
> diff --git a/amdgpu/amdgpu_vm.c b/amdgpu/amdgpu_vm.c
> new file mode 100644
> index 0000000..8a9a0a1
> --- /dev/null
> +++ b/amdgpu/amdgpu_vm.c
> @@ -0,0 +1,50 @@
> +/*
> + * Copyright 2017 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +
> +#include "amdgpu.h"
> +#include "amdgpu_drm.h"
> +#include "xf86drm.h"
> +#include "amdgpu_internal.h"
> +
> +int amdgpu_vm_reserve_vmid(amdgpu_context_handle context, uint32_t flags)
> +{
> +	union drm_amdgpu_vm vm;
> +
> +	vm.in.op = AMDGPU_VM_OP_RESERVE_VMID;
> +	vm.in.flags = flags;
> +
> +	return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM,
> +				   &vm, sizeof(vm));
> +}
> +
> +int amdgpu_vm_unreserve_vmid(amdgpu_context_handle context, uint32_t flags)
> +{
> +	union drm_amdgpu_vm vm;
> +
> +	vm.in.op = AMDGPU_VM_OP_UNRESERVE_VMID;
> +	vm.in.flags = flags;
> +
> +	return drmCommandWriteRead(context->dev->fd, DRM_AMDGPU_VM,
> +				   &vm, sizeof(vm));
> +}