* [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver
@ 2023-07-31 8:18 Kunal Joshi
2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kunal Joshi @ 2023-07-31 8:18 UTC (permalink / raw)
To: igt-dev; +Cc: Kunal Joshi
This patch series add supports for tiled framebuffers on xe
driver by adding blitter support
Juha-Pekka Heikkila (2):
lib/igt_fb: add intel_blt for blitter path on xe
lib/igt_fb: on xe driver switch from rendercopy to blitcopy
lib/igt_fb.c | 84 ++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 72 insertions(+), 12 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe 2023-07-31 8:18 [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver Kunal Joshi @ 2023-07-31 8:18 ` Kunal Joshi 2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 2/2] lib/igt_fb: on xe driver switch from rendercopy to blitcopy Kunal Joshi 2023-07-31 10:26 ` [igt-dev] ✗ Fi.CI.BAT: failure for enable tiled framebuffers on xe driver (rev2) Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Kunal Joshi @ 2023-07-31 8:18 UTC (permalink / raw) To: igt-dev; +Cc: Kunal Joshi Add intel_btl functions for xe driver on blitter path in igt_fb.c. This enables tiled framebuffers on xe driver. v2: Addressed minor changes (Zbigniew) Added s-o-b (Kamil) and CC Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com> Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> --- lib/igt_fb.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 7 deletions(-) diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 17738d7f1..7d1337303 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -2763,8 +2763,12 @@ static struct blt_copy_object *blt_fb_init(const struct igt_fb *fb, blt->plane_offset = fb->offsets[plane]; - blt->ptr = gem_mmap__device_coherent(fb->fd, handle, 0, fb->size, - PROT_READ | PROT_WRITE); + if (is_xe_device(fb->fd)) + blt->ptr = xe_bo_mmap_ext(fb->fd, handle, fb->size, + PROT_READ | PROT_WRITE); + else + blt->ptr = gem_mmap__device_coherent(fb->fd, handle, 0, fb->size, + PROT_READ | PROT_WRITE); return blt; } @@ -2838,16 +2842,23 @@ static void blitcopy(const struct igt_fb *dst_fb, uint64_t ahnd = 0; const intel_ctx_t *ictx = NULL; struct intel_execution_engine2 *e; - uint32_t bb; + uint32_t bb, xe_bb; uint64_t bb_size = 4096; struct blt_copy_data blt = {}; struct blt_copy_object *src, *dst; struct blt_block_copy_data_ext ext = {}, *pext = NULL; - uint32_t mem_region = HAS_FLATCCS(intel_get_drm_devid(src_fb->fd)) - ? REGION_LMEM(0) : REGION_SMEM; + uint32_t mem_region; /* To ignore CC plane */ uint32_t src_cc = src_fb->modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC ? 1 : 0; uint32_t dst_cc = dst_fb->modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC ? 1 : 0; + intel_ctx_t *xe_ctx; + uint32_t vm, engine; + bool is_xe = is_xe_device(dst_fb->fd); + bool is_i915 = is_i915_device(dst_fb->fd); + + struct drm_xe_engine_class_instance inst = { + .engine_class = DRM_XE_ENGINE_CLASS_COPY, + }; igt_assert_eq(dst_fb->fd, src_fb->fd); igt_assert_eq(dst_fb->num_planes - dst_cc, src_fb->num_planes - src_cc); @@ -2855,8 +2866,11 @@ static void blitcopy(const struct igt_fb *dst_fb, src_tiling = igt_fb_mod_to_tiling(src_fb->modifier); dst_tiling = igt_fb_mod_to_tiling(dst_fb->modifier); - if (is_i915_device(dst_fb->fd) && !gem_has_relocations(dst_fb->fd)) { + if (is_i915 && !gem_has_relocations(dst_fb->fd)) { igt_require(gem_has_contexts(dst_fb->fd)); + mem_region = HAS_FLATCCS(intel_get_drm_devid(src_fb->fd)) + ? REGION_LMEM(0) : REGION_SMEM; + ictx = intel_ctx_create_all_physical(src_fb->fd); ctx = gem_context_create(dst_fb->fd); ahnd = get_reloc_ahnd(dst_fb->fd, ctx); @@ -2865,6 +2879,19 @@ static void blitcopy(const struct igt_fb *dst_fb, &bb, &bb_size, mem_region) == 0); + } else if (is_xe) { + vm = xe_vm_create(dst_fb->fd, DRM_XE_VM_CREATE_ASYNC_BIND_OPS, 0); + engine = xe_engine_create(dst_fb->fd, vm, &inst, 0); + xe_ctx = intel_ctx_xe(dst_fb->fd, vm, engine, 0, 0, 0); + mem_region = vram_if_possible(dst_fb->fd, 0); + + ahnd = intel_allocator_open_full(dst_fb->fd, xe_ctx->vm, 0, 0, + INTEL_ALLOCATOR_SIMPLE, + ALLOC_STRATEGY_LOW_TO_HIGH, 0); + + bb_size = ALIGN(bb_size + xe_cs_prefetch_size(dst_fb->fd), + xe_get_default_alignment(dst_fb->fd)); + xe_bb = xe_bo_create_flags(dst_fb->fd, 0, bb_size, mem_region); } for (int i = 0; i < dst_fb->num_planes - dst_cc; i++) { @@ -2872,7 +2899,34 @@ static void blitcopy(const struct igt_fb *dst_fb, igt_assert_eq(dst_fb->plane_width[i], src_fb->plane_width[i]); igt_assert_eq(dst_fb->plane_height[i], src_fb->plane_height[i]); - if (fast_blit_ok(src_fb) && fast_blit_ok(dst_fb)) { + if (is_xe) { + src = blt_fb_init(src_fb, i, mem_region); + dst = blt_fb_init(dst_fb, i, mem_region); + + blt_copy_init(src_fb->fd, &blt); + blt.color_depth = blt_get_bpp(src_fb); + blt_set_copy_object(&blt.src, src); + blt_set_copy_object(&blt.dst, dst); + + blt_set_object_ext(&ext.src, + blt_compression_format(&blt, src_fb), + src_fb->width, src_fb->height, + SURFACE_TYPE_2D); + + blt_set_object_ext(&ext.dst, + blt_compression_format(&blt, dst_fb), + dst_fb->width, dst_fb->height, + SURFACE_TYPE_2D); + + pext = &ext; + + blt_set_batch(&blt.bb, xe_bb, bb_size, mem_region); + + blt_block_copy(src_fb->fd, xe_ctx, NULL, ahnd, &blt, pext); + + blt_destroy_object(src_fb->fd, src); + blt_destroy_object(dst_fb->fd, dst); + } else if (fast_blit_ok(src_fb) && fast_blit_ok(dst_fb)) { igt_blitter_fast_copy__raw(dst_fb->fd, ahnd, ctx, NULL, src_fb->gem_handle, @@ -2950,6 +3004,14 @@ static void blitcopy(const struct igt_fb *dst_fb, if (ctx) gem_context_destroy(dst_fb->fd, ctx); put_ahnd(ahnd); + + if(is_xe) { + gem_close(dst_fb->fd, xe_bb); + xe_engine_destroy(dst_fb->fd, engine); + xe_vm_destroy(dst_fb->fd, vm); + free(xe_ctx); + } + intel_ctx_destroy(src_fb->fd, ictx); } -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] lib/igt_fb: on xe driver switch from rendercopy to blitcopy 2023-07-31 8:18 [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver Kunal Joshi 2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi @ 2023-07-31 8:18 ` Kunal Joshi 2023-07-31 10:26 ` [igt-dev] ✗ Fi.CI.BAT: failure for enable tiled framebuffers on xe driver (rev2) Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Kunal Joshi @ 2023-07-31 8:18 UTC (permalink / raw) To: igt-dev; +Cc: Kunal Joshi on xe driver use blitcopy for everything where otherwise would use rendercopy. Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com> Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> --- lib/igt_fb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 7d1337303..b33c639ab 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -2529,7 +2529,7 @@ static bool use_enginecopy(const struct igt_fb *fb) if (!is_intel_device(fb->fd)) return false; - if (!is_xe_device(fb->fd) && blitter_ok(fb)) + if (blitter_ok(fb)) return false; return fb->modifier == I915_FORMAT_MOD_Yf_TILED || @@ -3038,9 +3038,7 @@ static void free_linear_mapping(struct fb_blit_upload *blit) igt_nouveau_delete_bo(&linear->fb); } else if (is_xe_device(fd)) { gem_munmap(linear->map, linear->fb.size); - copy_with_engine(blit, fb, &linear->fb); - - syncobj_wait(fd, &blit->ibb->engine_syncobj, 1, INT64_MAX, 0, NULL); + blitcopy(fb, &linear->fb); gem_close(fd, linear->fb.gem_handle); } else { gem_munmap(linear->map, linear->fb.size); @@ -3120,7 +3118,7 @@ static void setup_linear_mapping(struct fb_blit_upload *blit) linear->map = igt_nouveau_mmap_bo(&linear->fb, PROT_READ | PROT_WRITE); } else if (is_xe_device(fd)) { - copy_with_engine(blit, &linear->fb, fb); + blitcopy(&linear->fb, fb); linear->map = xe_bo_mmap_ext(fd, linear->fb.gem_handle, linear->fb.size, PROT_READ | PROT_WRITE); -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for enable tiled framebuffers on xe driver (rev2) 2023-07-31 8:18 [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver Kunal Joshi 2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi 2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 2/2] lib/igt_fb: on xe driver switch from rendercopy to blitcopy Kunal Joshi @ 2023-07-31 10:26 ` Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2023-07-31 10:26 UTC (permalink / raw) To: Kunal Joshi; +Cc: igt-dev [-- Attachment #1: Type: text/plain, Size: 237 bytes --] == Series Details == Series: enable tiled framebuffers on xe driver (rev2) URL : https://patchwork.freedesktop.org/series/120914/ State : failure == Summary == Series 120914 revision 2 was fully merged or fully failed: no git log [-- Attachment #2: Type: text/html, Size: 706 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver @ 2023-07-18 12:14 Kunal Joshi 2023-07-18 12:14 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi 0 siblings, 1 reply; 6+ messages in thread From: Kunal Joshi @ 2023-07-18 12:14 UTC (permalink / raw) To: igt-dev; +Cc: Kunal Joshi This patch series add supports for tiled framebuffers on xe driver by adding blitter support Juha-Pekka Heikkila (1): lib/igt_fb: add intel_blt for blitter path on xe lib/igt_fb: on xe driver switch from rendercopy to blitcopy lib/igt_fb.c | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 11 deletions(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe 2023-07-18 12:14 [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver Kunal Joshi @ 2023-07-18 12:14 ` Kunal Joshi 2023-07-20 5:16 ` Zbigniew Kempczyński 0 siblings, 1 reply; 6+ messages in thread From: Kunal Joshi @ 2023-07-18 12:14 UTC (permalink / raw) To: igt-dev From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Add intel_btl functions for xe driver on blitter path in igt_fb.c. This enables tiled framebuffers on xe driver. Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> --- lib/igt_fb.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 1814e8db1..6ce4b735a 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -2763,8 +2763,12 @@ static struct blt_copy_object *blt_fb_init(const struct igt_fb *fb, blt->plane_offset = fb->offsets[plane]; - blt->ptr = gem_mmap__device_coherent(fb->fd, handle, 0, fb->size, - PROT_READ | PROT_WRITE); + if (is_xe_device(fb->fd)) + blt->ptr = xe_bo_mmap_ext(fb->fd, handle, fb->size, + PROT_READ | PROT_WRITE); + else + blt->ptr = gem_mmap__device_coherent(fb->fd, handle, 0, fb->size, + PROT_READ | PROT_WRITE); return blt; } @@ -2838,16 +2842,20 @@ static void blitcopy(const struct igt_fb *dst_fb, uint64_t ahnd = 0; const intel_ctx_t *ictx = NULL; struct intel_execution_engine2 *e; - uint32_t bb; + uint32_t bb, xe_bb; uint64_t bb_size = 4096; struct blt_copy_data blt = {}; struct blt_copy_object *src, *dst; struct blt_block_copy_data_ext ext = {}, *pext = NULL; - uint32_t mem_region = HAS_FLATCCS(intel_get_drm_devid(src_fb->fd)) - ? REGION_LMEM(0) : REGION_SMEM; + uint32_t mem_region; /* To ignore CC plane */ uint32_t src_cc = src_fb->modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC ? 1 : 0; uint32_t dst_cc = dst_fb->modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC ? 1 : 0; + intel_ctx_t *xe_ctx; + uint32_t vm, engine; + struct drm_xe_engine_class_instance inst = { + .engine_class = DRM_XE_ENGINE_CLASS_COPY, + }; igt_assert_eq(dst_fb->fd, src_fb->fd); igt_assert_eq(dst_fb->num_planes - dst_cc, src_fb->num_planes - src_cc); @@ -2857,6 +2865,9 @@ static void blitcopy(const struct igt_fb *dst_fb, if (is_i915_device(dst_fb->fd) && !gem_has_relocations(dst_fb->fd)) { igt_require(gem_has_contexts(dst_fb->fd)); + mem_region = HAS_FLATCCS(intel_get_drm_devid(src_fb->fd)) + ? REGION_LMEM(0) : REGION_SMEM; + ictx = intel_ctx_create_all_physical(src_fb->fd); ctx = gem_context_create(dst_fb->fd); ahnd = get_reloc_ahnd(dst_fb->fd, ctx); @@ -2865,6 +2876,19 @@ static void blitcopy(const struct igt_fb *dst_fb, &bb, &bb_size, mem_region) == 0); + } else if(is_xe_device(dst_fb->fd)) { + vm = xe_vm_create(dst_fb->fd, DRM_XE_VM_CREATE_ASYNC_BIND_OPS, 0); + engine = xe_engine_create(dst_fb->fd, vm, &inst, 0); + xe_ctx = intel_ctx_xe(dst_fb->fd, vm, engine, 0, 0, 0); + mem_region = vram_if_possible(dst_fb->fd, 0); + + ahnd = intel_allocator_open_full(dst_fb->fd, xe_ctx->vm, 0, 0, + INTEL_ALLOCATOR_SIMPLE, + ALLOC_STRATEGY_LOW_TO_HIGH, 0); + + bb_size = ALIGN(bb_size + xe_cs_prefetch_size(dst_fb->fd), + xe_get_default_alignment(dst_fb->fd)); + xe_bb = xe_bo_create_flags(dst_fb->fd, 0, bb_size, mem_region); } for (int i = 0; i < dst_fb->num_planes - dst_cc; i++) { @@ -2872,7 +2896,34 @@ static void blitcopy(const struct igt_fb *dst_fb, igt_assert_eq(dst_fb->plane_width[i], src_fb->plane_width[i]); igt_assert_eq(dst_fb->plane_height[i], src_fb->plane_height[i]); - if (fast_blit_ok(src_fb) && fast_blit_ok(dst_fb)) { + if (is_xe_device(dst_fb->fd)) { + src = blt_fb_init(src_fb, i, mem_region); + dst = blt_fb_init(dst_fb, i, mem_region); + + blt_copy_init(src_fb->fd, &blt); + blt.color_depth = blt_get_bpp(src_fb); + blt_set_copy_object(&blt.src, src); + blt_set_copy_object(&blt.dst, dst); + + blt_set_object_ext(&ext.src, + blt_compression_format(&blt, src_fb), + src_fb->width, src_fb->height, + SURFACE_TYPE_2D); + + blt_set_object_ext(&ext.dst, + blt_compression_format(&blt, dst_fb), + dst_fb->width, dst_fb->height, + SURFACE_TYPE_2D); + + pext = &ext; + + blt_set_batch(&blt.bb, xe_bb, bb_size, mem_region); + + blt_block_copy(src_fb->fd, xe_ctx, NULL, ahnd, &blt, pext); + + blt_destroy_object(src_fb->fd, src); + blt_destroy_object(dst_fb->fd, dst); + } else if (fast_blit_ok(src_fb) && fast_blit_ok(dst_fb)) { igt_blitter_fast_copy__raw(dst_fb->fd, ahnd, ctx, NULL, src_fb->gem_handle, @@ -2950,6 +3001,14 @@ static void blitcopy(const struct igt_fb *dst_fb, if (ctx) gem_context_destroy(dst_fb->fd, ctx); put_ahnd(ahnd); + + if(is_xe_device(dst_fb->fd)) { + gem_close(dst_fb->fd, xe_bb); + xe_engine_destroy(dst_fb->fd, engine); + xe_vm_destroy(dst_fb->fd, vm); + free(xe_ctx); + } + intel_ctx_destroy(src_fb->fd, ictx); } -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe 2023-07-18 12:14 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi @ 2023-07-20 5:16 ` Zbigniew Kempczyński 0 siblings, 0 replies; 6+ messages in thread From: Zbigniew Kempczyński @ 2023-07-20 5:16 UTC (permalink / raw) To: Kunal Joshi; +Cc: igt-dev On Tue, Jul 18, 2023 at 05:44:42PM +0530, Kunal Joshi wrote: > From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> > > Add intel_btl functions for xe driver on blitter path in igt_fb.c. > This enables tiled framebuffers on xe driver. > > Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> > --- > lib/igt_fb.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 65 insertions(+), 6 deletions(-) > > diff --git a/lib/igt_fb.c b/lib/igt_fb.c > index 1814e8db1..6ce4b735a 100644 > --- a/lib/igt_fb.c > +++ b/lib/igt_fb.c > @@ -2763,8 +2763,12 @@ static struct blt_copy_object *blt_fb_init(const struct igt_fb *fb, > > blt->plane_offset = fb->offsets[plane]; > > - blt->ptr = gem_mmap__device_coherent(fb->fd, handle, 0, fb->size, > - PROT_READ | PROT_WRITE); > + if (is_xe_device(fb->fd)) > + blt->ptr = xe_bo_mmap_ext(fb->fd, handle, fb->size, > + PROT_READ | PROT_WRITE); > + else > + blt->ptr = gem_mmap__device_coherent(fb->fd, handle, 0, fb->size, > + PROT_READ | PROT_WRITE); > return blt; > } > > @@ -2838,16 +2842,20 @@ static void blitcopy(const struct igt_fb *dst_fb, > uint64_t ahnd = 0; > const intel_ctx_t *ictx = NULL; > struct intel_execution_engine2 *e; > - uint32_t bb; > + uint32_t bb, xe_bb; > uint64_t bb_size = 4096; > struct blt_copy_data blt = {}; > struct blt_copy_object *src, *dst; > struct blt_block_copy_data_ext ext = {}, *pext = NULL; > - uint32_t mem_region = HAS_FLATCCS(intel_get_drm_devid(src_fb->fd)) > - ? REGION_LMEM(0) : REGION_SMEM; > + uint32_t mem_region; > /* To ignore CC plane */ > uint32_t src_cc = src_fb->modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC ? 1 : 0; > uint32_t dst_cc = dst_fb->modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC ? 1 : 0; > + intel_ctx_t *xe_ctx; > + uint32_t vm, engine; > + struct drm_xe_engine_class_instance inst = { > + .engine_class = DRM_XE_ENGINE_CLASS_COPY, > + }; > > igt_assert_eq(dst_fb->fd, src_fb->fd); > igt_assert_eq(dst_fb->num_planes - dst_cc, src_fb->num_planes - src_cc); > @@ -2857,6 +2865,9 @@ static void blitcopy(const struct igt_fb *dst_fb, > > if (is_i915_device(dst_fb->fd) && !gem_has_relocations(dst_fb->fd)) { > igt_require(gem_has_contexts(dst_fb->fd)); > + mem_region = HAS_FLATCCS(intel_get_drm_devid(src_fb->fd)) > + ? REGION_LMEM(0) : REGION_SMEM; > + > ictx = intel_ctx_create_all_physical(src_fb->fd); > ctx = gem_context_create(dst_fb->fd); > ahnd = get_reloc_ahnd(dst_fb->fd, ctx); > @@ -2865,6 +2876,19 @@ static void blitcopy(const struct igt_fb *dst_fb, > &bb, > &bb_size, > mem_region) == 0); > + } else if(is_xe_device(dst_fb->fd)) { Minor nit: ^ missing space after if BTW I see there're multiple times calling is_xe_device(), maybe it's worth to add: bool is_xe = is_xe_device(fd); bool is_i915 = is_i915_device(fd); on the very beginning to avoid calling same function? Anyway, that's not so heavy so decision is yours. > + vm = xe_vm_create(dst_fb->fd, DRM_XE_VM_CREATE_ASYNC_BIND_OPS, 0); > + engine = xe_engine_create(dst_fb->fd, vm, &inst, 0); > + xe_ctx = intel_ctx_xe(dst_fb->fd, vm, engine, 0, 0, 0); > + mem_region = vram_if_possible(dst_fb->fd, 0); > + > + ahnd = intel_allocator_open_full(dst_fb->fd, xe_ctx->vm, 0, 0, > + INTEL_ALLOCATOR_SIMPLE, > + ALLOC_STRATEGY_LOW_TO_HIGH, 0); > + > + bb_size = ALIGN(bb_size + xe_cs_prefetch_size(dst_fb->fd), > + xe_get_default_alignment(dst_fb->fd)); > + xe_bb = xe_bo_create_flags(dst_fb->fd, 0, bb_size, mem_region); > } > > for (int i = 0; i < dst_fb->num_planes - dst_cc; i++) { > @@ -2872,7 +2896,34 @@ static void blitcopy(const struct igt_fb *dst_fb, > igt_assert_eq(dst_fb->plane_width[i], src_fb->plane_width[i]); > igt_assert_eq(dst_fb->plane_height[i], src_fb->plane_height[i]); > > - if (fast_blit_ok(src_fb) && fast_blit_ok(dst_fb)) { > + if (is_xe_device(dst_fb->fd)) { > + src = blt_fb_init(src_fb, i, mem_region); > + dst = blt_fb_init(dst_fb, i, mem_region); > + > + blt_copy_init(src_fb->fd, &blt); > + blt.color_depth = blt_get_bpp(src_fb); > + blt_set_copy_object(&blt.src, src); > + blt_set_copy_object(&blt.dst, dst); > + > + blt_set_object_ext(&ext.src, > + blt_compression_format(&blt, src_fb), > + src_fb->width, src_fb->height, > + SURFACE_TYPE_2D); > + > + blt_set_object_ext(&ext.dst, > + blt_compression_format(&blt, dst_fb), > + dst_fb->width, dst_fb->height, > + SURFACE_TYPE_2D); > + > + pext = &ext; > + > + blt_set_batch(&blt.bb, xe_bb, bb_size, mem_region); > + > + blt_block_copy(src_fb->fd, xe_ctx, NULL, ahnd, &blt, pext); > + > + blt_destroy_object(src_fb->fd, src); > + blt_destroy_object(dst_fb->fd, dst); > + } else if (fast_blit_ok(src_fb) && fast_blit_ok(dst_fb)) { Next nit ^ --- double space > igt_blitter_fast_copy__raw(dst_fb->fd, > ahnd, ctx, NULL, > src_fb->gem_handle, > @@ -2950,6 +3001,14 @@ static void blitcopy(const struct igt_fb *dst_fb, > if (ctx) > gem_context_destroy(dst_fb->fd, ctx); > put_ahnd(ahnd); > + > + if(is_xe_device(dst_fb->fd)) { And same here, missing space after if. Rest code looks good for me. Fix nits and got: Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> -- Zbigniew > + gem_close(dst_fb->fd, xe_bb); > + xe_engine_destroy(dst_fb->fd, engine); > + xe_vm_destroy(dst_fb->fd, vm); > + free(xe_ctx); > + } > + > intel_ctx_destroy(src_fb->fd, ictx); > } > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-31 10:26 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-07-31 8:18 [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver Kunal Joshi 2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi 2023-07-31 8:18 ` [igt-dev] [PATCH i-g-t 2/2] lib/igt_fb: on xe driver switch from rendercopy to blitcopy Kunal Joshi 2023-07-31 10:26 ` [igt-dev] ✗ Fi.CI.BAT: failure for enable tiled framebuffers on xe driver (rev2) Patchwork -- strict thread matches above, loose matches on Subject: below -- 2023-07-18 12:14 [igt-dev] [PATCH i-g-t 0/2] enable tiled framebuffers on xe driver Kunal Joshi 2023-07-18 12:14 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Kunal Joshi 2023-07-20 5:16 ` Zbigniew Kempczyński
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox