From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Matthew Auld To: igt-dev@lists.freedesktop.org Date: Thu, 5 Oct 2023 16:31:14 +0100 Message-ID: <20231005153116.452319-11-matthew.auld@intel.com> In-Reply-To: <20231005153116.452319-1-matthew.auld@intel.com> References: <20231005153116.452319-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 10/12] lib/xe_ioctl: update vm_bind to account for pat_index List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-xe@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Keep things minimal and select the 1way+ by default on all platforms. Other users can use intel_buf, get_offset_pat_index etc or use __xe_vm_bind() directly. Display tests don't directly use this interface. Signed-off-by: Matthew Auld Cc: José Roberto de Souza Cc: Pallavi Mishra --- lib/xe/xe_ioctl.c | 8 ++++++-- lib/xe/xe_ioctl.h | 2 +- tests/intel/xe_vm.c | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/xe/xe_ioctl.c b/lib/xe/xe_ioctl.c index 80696aa59..ebaed1e96 100644 --- a/lib/xe/xe_ioctl.c +++ b/lib/xe/xe_ioctl.c @@ -41,6 +41,7 @@ #include "config.h" #include "drmtest.h" #include "igt_syncobj.h" +#include "intel_pat.h" #include "ioctl_wrappers.h" #include "xe_ioctl.h" #include "xe_query.h" @@ -92,7 +93,7 @@ void xe_vm_bind_array(int fd, uint32_t vm, uint32_t exec_queue, 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, struct drm_xe_sync *sync, uint32_t num_syncs, uint32_t region, - uint64_t ext) + uint8_t pat_index, uint64_t ext) { struct drm_xe_vm_bind bind = { .extensions = ext, @@ -107,6 +108,8 @@ int __xe_vm_bind(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo, .num_syncs = num_syncs, .syncs = (uintptr_t)sync, .exec_queue_id = exec_queue, + .bind.pat_index = (pat_index == DEFAULT_PAT_INDEX) ? + intel_get_pat_idx_wb(fd) : pat_index, }; if (igt_ioctl(fd, DRM_IOCTL_XE_VM_BIND, &bind)) @@ -121,7 +124,8 @@ void __xe_vm_bind_assert(int fd, uint32_t vm, uint32_t exec_queue, uint32_t bo, uint32_t num_syncs, uint32_t region, uint64_t ext) { igt_assert_eq(__xe_vm_bind(fd, vm, exec_queue, bo, offset, addr, size, - op, sync, num_syncs, region, ext), 0); + op, sync, num_syncs, region, DEFAULT_PAT_INDEX, + ext), 0); } void xe_vm_bind(int fd, uint32_t vm, uint32_t bo, uint64_t offset, diff --git a/lib/xe/xe_ioctl.h b/lib/xe/xe_ioctl.h index c18fc878c..cafbb011a 100644 --- a/lib/xe/xe_ioctl.h +++ b/lib/xe/xe_ioctl.h @@ -20,7 +20,7 @@ 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, struct drm_xe_sync *sync, uint32_t num_syncs, uint32_t region, - uint64_t ext); + uint8_t pat_index, uint64_t ext); 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, struct drm_xe_sync *sync, diff --git a/tests/intel/xe_vm.c b/tests/intel/xe_vm.c index 4952ea786..ffb70973b 100644 --- a/tests/intel/xe_vm.c +++ b/tests/intel/xe_vm.c @@ -10,6 +10,7 @@ */ #include "igt.h" +#include "intel_pat.h" #include "lib/igt_syncobj.h" #include "lib/intel_reg.h" #include "xe_drm.h" @@ -316,7 +317,8 @@ static void userptr_invalid(int fd) vm = xe_vm_create(fd, 0, 0); munmap(data, size); ret = __xe_vm_bind(fd, vm, 0, 0, to_user_pointer(data), 0x40000, - size, XE_VM_BIND_OP_MAP_USERPTR, NULL, 0, 0, 0); + size, XE_VM_BIND_OP_MAP_USERPTR, NULL, 0, 0, + DEFAULT_PAT_INDEX, 0); igt_assert(ret == -EFAULT); xe_vm_destroy(fd, vm); -- 2.41.0