From: Kunal Joshi <kunal1.joshi@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe
Date: Tue, 18 Jul 2023 17:44:42 +0530 [thread overview]
Message-ID: <20230718121443.445343-2-kunal1.joshi@intel.com> (raw)
In-Reply-To: <20230718121443.445343-1-kunal1.joshi@intel.com>
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
next prev parent reply other threads:[~2023-07-18 12:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2023-07-20 5:16 ` [igt-dev] [PATCH i-g-t 1/2] lib/igt_fb: add intel_blt for blitter path on xe Zbigniew Kempczyński
2023-07-18 12:14 ` [igt-dev] [PATCH i-g-t 2/2] lib/igt_fb: on xe driver switch from rendercopy to blitcopy Kunal Joshi
2023-07-20 10:02 ` Zbigniew Kempczyński
2023-07-24 7:36 ` Joshi, Kunal1
2023-07-25 10:16 ` Joshi, Kunal1
2023-07-25 10:23 ` Zbigniew Kempczyński
2023-07-27 13:59 ` Kamil Konieczny
2023-07-18 15:28 ` [igt-dev] ✓ Fi.CI.BAT: success for enable tiled framebuffers on xe driver Patchwork
2023-07-18 15:50 ` [igt-dev] ○ CI.xeBAT: info " Patchwork
2023-07-18 20:40 ` [igt-dev] ✓ Fi.CI.IGT: success " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-07-31 8:18 [igt-dev] [PATCH i-g-t 0/2] " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230718121443.445343-2-kunal1.joshi@intel.com \
--to=kunal1.joshi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox