[PATCH i-g-t v9 1/2] tests/kms_prime: Add XE support
Kamil Konieczny
kamil.konieczny at linux.intel.com
Wed Aug 13 10:53:07 UTC 2025
Hi Santhosh,
On 2025-08-08 at 16:50:49 +0530, Santhosh Reddy Guddati wrote:
> From: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
>
> Add XE driver support for kms tests.
>
> V2: - Use rendercopy method for both i915 & xe
> - Minor cleanup
> V3: - New patch for cleanup & rendercopy
> V4: - Fallback to blitter
> V5: - Rebase
> v7: - Rebase and patch cleanup
> v8: - D3hot subtest is not required for xe
> v9: - nitpicks (Matthew)
> v10:- Rebase
> v11:- Split the commits per subtest and refactor code (Kamil, Kunal)
> - Enable basic-crc-hybrid subtest for xe.
> - Added Xe Prime support for hybrid graphics by enabling
> buffer sharing between integrated and discrete GPUs.
> - Refactor buffer creation function for Xe discrete buffers.
> - Introduced helper functions for creating and mapping dumb buffers.
> Also, implement fast buffer import for Xe discrete GPUs
> using BLT copy operations.
> v12: Fix CRC mismatch by using correct color depth constant.
This is not full review, I spotted few nits, see below.
>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> Signed-off-by: Nidhi Gupta <nidhi1.gupta at intel.com>
> Signed-off-by: Santhosh Reddy Guddati <santhosh.reddy.guddati at intel.com>
> ---
> tests/kms_prime.c | 192 +++++++++++++++++++++++++++++++++++++---------
> 1 file changed, 156 insertions(+), 36 deletions(-)
>
> diff --git a/tests/kms_prime.c b/tests/kms_prime.c
> index 1d011327c..c6720e984 100644
> --- a/tests/kms_prime.c
> +++ b/tests/kms_prime.c
> @@ -34,10 +34,18 @@
> #include "igt_debugfs.h"
> #include "igt_sysfs.h"
While you are at this, please move igt headers after system ones.
> #include <fcntl.h>
> +#include <limits.h>
>
Remove this empty line.
> #include <poll.h>
> #include <sys/ioctl.h>
> #include <time.h>
Add here empty line.
> +#include "lib/intel_blt.h"
> +#include "lib/intel_common.h"
> +#include "lib/intel_pat.h"
> +#include "lib/intel_mocs.h"
> +#include "xe/xe_ioctl.h"
> +#include "xe/xe_query.h"
> +
Remove this one last empty line.
One more nit at end.
>
> /**
> * SUBTEST: D3hot
> @@ -117,10 +125,13 @@ static igt_output_t *setup_display(int importer_fd, igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, *pipe);
> - if (intel_pipe_output_combo_valid(display)) {
> - found = true;
> - break;
> + if (is_intel_dgfx(importer_fd)) {
> + if (!intel_pipe_output_combo_valid(display))
> + continue;
> }
> +
> + found = true;
> + break;
> }
>
> igt_require_f(found, "No valid connector/pipe found\n");
> @@ -128,24 +139,63 @@ static igt_output_t *setup_display(int importer_fd, igt_display_t *display,
> return output;
> }
>
> +static uint32_t *create_and_map_dump_bo(int fd, struct dumb_bo *bo,
> + uint32_t width, uint32_t height,
> + uint32_t bpp, uint32_t *pitch,
> + uint64_t *size)
> +{
> + uint32_t *ptr;
> +
> + bo->width = width;
> + bo->height = height;
> + bo->bpp = bpp;
> +
> + bo->handle = kmstest_dumb_create(fd, bo->width,
> + bo->height, bo->bpp, pitch, size);
> +
> + ptr = kmstest_dumb_map_buffer(fd, bo->handle, *size, PROT_READ | PROT_WRITE);
> + igt_assert(ptr != MAP_FAILED);
> +
> + return ptr;
> +}
> +
> +static uint32_t *prepare_xe_dgfx_scratch(int exporter_fd, struct dumb_bo *scratch)
> +{
> + uint32_t *ptr;
> + struct blt_copy_data ex_blt = {};
> + struct blt_copy_object *src = NULL;
> + uint32_t region;
> +
> + region = DRM_XE_MEM_REGION_CLASS_VRAM;
> + igt_info("Preparing scratch buffer for DGfx exporter\n");
> + blt_copy_init(exporter_fd, &ex_blt);
> + src = blt_create_object(&ex_blt, region,
> + scratch->width, scratch->height,
> + scratch->bpp, 0, T_LINEAR,
> + COMPRESSION_DISABLED, 0, true);
> + scratch->handle = src->handle;
> + scratch->size = src->size;
> + scratch->pitch = src->pitch;
> + ptr = xe_bo_mmap_ext(exporter_fd, scratch->handle, scratch->size,
> + PROT_READ | PROT_WRITE);
> + igt_assert(ptr != MAP_FAILED);
> + return ptr;
> +}
> +
> static void prepare_scratch(int exporter_fd, struct dumb_bo *scratch,
> drmModeModeInfo *mode, uint32_t color)
> {
> uint32_t *ptr;
> + bool is_dgfx;
>
> scratch->width = mode->hdisplay;
> scratch->height = mode->vdisplay;
> scratch->bpp = 32;
> + is_dgfx = is_intel_dgfx(exporter_fd);
>
> - if (!is_i915_device(exporter_fd)) {
> - scratch->handle = kmstest_dumb_create(exporter_fd,
> - ALIGN(scratch->width, 256),
> - scratch->height, scratch->bpp,
> - &scratch->pitch, &scratch->size);
> -
> - ptr = kmstest_dumb_map_buffer(exporter_fd, scratch->handle,
> - scratch->size, PROT_WRITE);
> - } else {
> + if (is_xe_device(exporter_fd) && is_dgfx) {
> + ptr = prepare_xe_dgfx_scratch(exporter_fd, scratch);
> + } else if (is_i915_device(exporter_fd) && is_dgfx) {
> struct igt_fb fb;
>
> igt_init_fb(&fb, exporter_fd, mode->hdisplay, mode->vdisplay,
> @@ -165,6 +215,11 @@ static void prepare_scratch(int exporter_fd, struct dumb_bo *scratch,
>
> ptr = gem_mmap__device_coherent(exporter_fd, scratch->handle, 0, scratch->size,
> PROT_WRITE | PROT_READ);
> + } else {
> + ptr = create_and_map_dump_bo(exporter_fd, scratch,
> + scratch->width, scratch->height,
> + scratch->bpp, &scratch->pitch,
> + &scratch->size);
> }
>
> for (size_t idx = 0; idx < scratch->size / sizeof(*ptr); ++idx)
> @@ -184,40 +239,109 @@ static void prepare_fb(int importer_fd, struct dumb_bo *scratch, struct igt_fb *
> }
>
> static void import_fb(int importer_fd, struct igt_fb *fb,
> - int dmabuf_fd, uint32_t pitch)
> + int dmabuf_fd, struct dumb_bo *scratch)
> {
> uint32_t offsets[4] = {}, pitches[4] = {}, handles[4] = {}, temp_buf_handle;
> int ret;
>
> - if (is_i915_device(importer_fd)) {
> - if (gem_has_lmem(importer_fd)) {
> - uint64_t ahnd = get_reloc_ahnd(importer_fd, 0);
> - uint64_t fb_size = 0;
> + igt_debug("Importing FB: importer_fd=%d, dmabuf_fd=%d, width=%u, height=%u\n",
> + importer_fd, dmabuf_fd, fb->width, fb->height);
>
> - igt_info("Importer is dGPU\n");
> - temp_buf_handle = prime_fd_to_handle(importer_fd, dmabuf_fd);
> - igt_assert(temp_buf_handle > 0);
> - fb->gem_handle = igt_create_bo_with_dimensions(importer_fd, fb->width, fb->height,
> - fb->drm_format, fb->modifier, pitch, &fb_size, NULL, NULL);
> - igt_assert(fb->gem_handle > 0);
> + if (is_intel_dgfx(importer_fd)) {
> + uint64_t fb_size = 0;
> + uint64_t ahnd = 0;
> +
> + igt_info("Importer is dGPU\n");
> + temp_buf_handle = prime_fd_to_handle(importer_fd, dmabuf_fd);
> + igt_assert(temp_buf_handle > 0);
> + fb->gem_handle = igt_create_bo_with_dimensions(importer_fd, fb->width,
> + fb->height, fb->drm_format,
> + fb->modifier, scratch->pitch,
> + &fb_size, NULL, NULL);
> + igt_assert(fb->gem_handle > 0);
> +
> + if (is_i915_device(importer_fd)) {
> + ahnd = get_reloc_ahnd(importer_fd, 0);
>
> igt_blitter_src_copy(importer_fd, ahnd, 0, NULL, temp_buf_handle,
> - 0, pitch, fb->modifier, 0, 0, fb_size, fb->width,
> - fb->height, 32, fb->gem_handle, 0, pitch, fb->modifier,
> - 0, 0, fb_size);
> + 0, scratch->pitch, fb->modifier,
> + 0, 0, fb_size, fb->width,
> + fb->height, 32, fb->gem_handle,
> + 0, scratch->pitch, fb->modifier,
> + 0, 0, fb_size);
>
> gem_sync(importer_fd, fb->gem_handle);
> gem_close(importer_fd, temp_buf_handle);
> put_ahnd(ahnd);
> - } else {
> - fb->gem_handle = prime_fd_to_handle(importer_fd, dmabuf_fd);
> + } else if (is_xe_device(importer_fd)) {
> + uint32_t xe_bb;
> + struct blt_copy_data blt = {0};
> + struct blt_copy_object *src, *dst;
> + uint32_t vm, xe_exec;
> + intel_ctx_t *xe_ctx;
> +
> + struct drm_xe_engine_class_instance inst = {
> + .engine_class = DRM_XE_ENGINE_CLASS_COPY,
> + };
> +
> + vm = xe_vm_create(importer_fd, 0, 0);
> + xe_exec = xe_exec_queue_create(importer_fd, vm, &inst, 0);
> + xe_ctx = intel_ctx_xe(importer_fd, vm, xe_exec, 0, 0, 0);
> + ahnd = intel_allocator_open_full(importer_fd, xe_ctx->vm, 0, 0,
> + INTEL_ALLOCATOR_SIMPLE,
> + ALLOC_STRATEGY_LOW_TO_HIGH, 0);
> +
> + igt_init_fb(fb, importer_fd, scratch->width, scratch->height,
> + DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
> + IGT_COLOR_YCBCR_BT709, IGT_COLOR_YCBCR_LIMITED_RANGE);
> +
> + igt_calc_fb_size(fb);
> +
> + fb->gem_handle = xe_bo_create(importer_fd, 0, fb->size,
> + vram_if_possible(importer_fd, 0), 0);
> + igt_require(fb->gem_handle);
> +
> + blt_copy_init(importer_fd, &blt);
> +
> + src = blt_create_object(&blt, vram_if_possible(importer_fd, 0),
> + scratch->width, scratch->height, 32, 0,
> + T_LINEAR, COMPRESSION_DISABLED, 0, true);
> + blt_set_object(src, temp_buf_handle, scratch->size,
> + vram_if_possible(importer_fd, 0), 0,
> + DEFAULT_PAT_INDEX,
> + T_LINEAR, COMPRESSION_DISABLED, 0);
> +
> + dst = blt_create_object(&blt, vram_if_possible(importer_fd, 0),
> + scratch->width, scratch->height, 32, 0,
> + T_LINEAR, COMPRESSION_DISABLED, 0, true);
> + blt_set_object(dst, fb->gem_handle, fb->size,
> + vram_if_possible(importer_fd, 0), 0,
> + DEFAULT_PAT_INDEX,
> + T_LINEAR, COMPRESSION_DISABLED, 0);
> +
> + blt.color_depth = CD_32bit;
> + blt_set_copy_object(&blt.src, src);
> + blt_set_copy_object(&blt.dst, dst);
> +
> + xe_bb = xe_bo_create(importer_fd, 0, fb->size,
> + vram_if_possible(importer_fd, 0), 0);
> +
> + blt_set_batch(&blt.bb, xe_bb, fb->size, vram_if_possible(importer_fd, 0));
> + blt_fast_copy(importer_fd, xe_ctx, NULL, ahnd, &blt);
> +
> + put_offset(ahnd, dst->handle);
> + put_offset(ahnd, src->handle);
> + put_offset(ahnd, xe_bb);
> + intel_allocator_bind(ahnd, 0, 0);
> + put_ahnd(ahnd);
> }
> } else {
> fb->gem_handle = prime_fd_to_handle(importer_fd, dmabuf_fd);
> + igt_assert(fb->gem_handle > 0);
> }
>
> handles[0] = fb->gem_handle;
> - pitches[0] = pitch;
> + pitches[0] = scratch->pitch;
> offsets[0] = 0;
>
> ret = drmModeAddFB2(importer_fd, fb->width, fb->height,
> @@ -284,7 +408,7 @@ static void test_crc(int exporter_fd, int importer_fd)
> gem_close(exporter_fd, scratch.handle);
>
> prepare_fb(importer_fd, &scratch, &fb);
> - import_fb(importer_fd, &fb, dmabuf_fd, scratch.pitch);
> + import_fb(importer_fd, &fb, dmabuf_fd, &scratch);
> close(dmabuf_fd);
>
> colors[i].prime_crc.name = "prime";
> @@ -475,6 +599,8 @@ igt_main
> igt_require(second_fd_vgem >= 0);
> if (is_i915_device(first_fd))
> igt_require(!gem_has_lmem(first_fd));
> + if (is_xe_device(first_fd))
> + igt_require(!xe_has_vram(first_fd));
> }
>
> igt_describe("Make a dumb color buffer, export to another device and"
> @@ -485,11 +611,5 @@ igt_main
> igt_dynamic("second-to-first")
> test_crc(second_fd_vgem, first_fd);
> }
> -
> - igt_fixture
> - drm_close_driver(second_fd_vgem);
> }
> -
> - igt_fixture
> - drm_close_driver(first_fd);
Do not remove those fixtures.
Regards,
Kamil
> }
> --
> 2.34.1
>
More information about the igt-dev
mailing list