From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 732F010E58D for ; Fri, 20 Oct 2023 08:13:34 +0000 (UTC) Message-ID: <617d8730-aacc-020e-673a-456d5bad2498@intel.com> Date: Fri, 20 Oct 2023 09:13:30 +0100 MIME-Version: 1.0 Content-Language: en-GB To: Niranjana Vishwanathapura References: <20231019144106.560624-1-matthew.auld@intel.com> <20231019144106.560624-11-matthew.auld@intel.com> From: Matthew Auld In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [igt-dev] [PATCH i-g-t v4 10/15] lib/xe_ioctl: update vm_bind to account for pat_index List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 20/10/2023 06:19, Niranjana Vishwanathapura wrote: > On Thu, Oct 19, 2023 at 10:37:57AM -0700, Niranjana Vishwanathapura wrote: >> On Thu, Oct 19, 2023 at 03:41:01PM +0100, Matthew Auld wrote: >>> 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 | 5 ++++- >>> 3 files changed, 11 insertions(+), 4 deletions(-) >>> >>> diff --git a/lib/xe/xe_ioctl.c b/lib/xe/xe_ioctl.c >>> index 4cf44f1ee..f51f931ee 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, >>>           uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs, >>> -          uint32_t region, uint64_t ext) >>> +          uint32_t region, uint8_t pat_index, uint64_t ext) >>> { >>>     struct drm_xe_vm_bind bind = { >>>         .extensions = ext, >>> @@ -108,6 +109,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)) >>> @@ -122,7 +125,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, flags, sync, num_syncs, region, ext), 0); >>> +                   op, flags, 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 e3f62a28a..a28375d3e 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, >>>           uint32_t flags, struct drm_xe_sync *sync, uint32_t num_syncs, >>> -          uint32_t region, uint64_t ext); >>> +          uint32_t region, 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, uint32_t flags, struct drm_xe_sync *sync, >>> diff --git a/tests/intel/xe_vm.c b/tests/intel/xe_vm.c >>> index dd3302337..a01e1ba47 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, 0, NULL, 0, 0, 0); >>> +               size, XE_VM_BIND_OP_MAP_USERPTR, 0, NULL, 0, 0, >>> +               DEFAULT_PAT_INDEX, 0); >>>     igt_assert(ret == -EFAULT); >>> >>>     xe_vm_destroy(fd, vm); >>> @@ -755,6 +757,7 @@ test_bind_array(int fd, struct >>> drm_xe_engine_class_instance *eci, int n_execs, >>>         bind_ops[i].op = XE_VM_BIND_OP_MAP; >>>         bind_ops[i].flags = XE_VM_BIND_FLAG_ASYNC; >>>         bind_ops[i].region = 0; >>> +        bind_ops[i].pat_index = intel_get_pat_idx_wb(fd); >>>         bind_ops[i].reserved[0] = 0; >>>         bind_ops[i].reserved[1] = 0; >> >> I am seeing few other (below) usage of vm_bind_array() calls. >> lib/xe/xe_util.c >> lib/intel_batchbuffer.c >> >> I think they need to be updated too. >> > > I see lib/intel_batchbuffer.c case is handled in previous patch. > That leaves only lib/xe/xe_util.c case. xe_util was converted in: "lib/allocator: add get_offset_pat_index() helper". The get_offset() stuff uses the xe_util method of binding so was converted in that patch. > > Niranjana > >> Niranjana >> >>> >>> -- >>> 2.41.0 >>>