[igt-dev] [i-g-t V3 18/45] tests/i915/kms_big_fb: Add XE support
B, Jeevan
jeevan.b at intel.com
Thu Apr 27 05:46:28 UTC 2023
> -----Original Message-----
> From: igt-dev <igt-dev-bounces at lists.freedesktop.org> On Behalf Of
> Bhanuprakash Modem
> Sent: Wednesday, April 26, 2023 5:17 PM
> To: igt-dev at lists.freedesktop.org
> Subject: [igt-dev] [i-g-t V3 18/45] tests/i915/kms_big_fb: Add XE support
>
> Add XE driver support for kms tests.
LGTM
>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
Reviewed-by: Jeevan B <jeevan.b at intel.com>
> ---
> tests/i915/kms_big_fb.c | 74 ++++++++++++++++++++++++++++++++---------
> 1 file changed, 59 insertions(+), 15 deletions(-)
>
> diff --git a/tests/i915/kms_big_fb.c b/tests/i915/kms_big_fb.c index
> a0d5ef730..c120a14a6 100644
> --- a/tests/i915/kms_big_fb.c
> +++ b/tests/i915/kms_big_fb.c
> @@ -28,6 +28,7 @@
> #include <string.h>
>
> #include "i915/gem_create.h"
> +#include "xe/xe_ioctl.h"
> #include "xe/xe_query.h"
>
> IGT_TEST_DESCRIPTION("Test big framebuffers"); @@ -104,10 +105,12 @@
> static void copy_pattern(data_t *data,
> src = init_buf(data, src_fb, "big fb src");
> dst = init_buf(data, dst_fb, "big fb dst");
>
> - gem_set_domain(data->drm_fd, dst_fb->gem_handle,
> - I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
> - gem_set_domain(data->drm_fd, src_fb->gem_handle,
> - I915_GEM_DOMAIN_GTT, 0);
> + if (is_i915_device(data->drm_fd)) {
> + gem_set_domain(data->drm_fd, dst_fb->gem_handle,
> + I915_GEM_DOMAIN_GTT,
> I915_GEM_DOMAIN_GTT);
> + gem_set_domain(data->drm_fd, src_fb->gem_handle,
> + I915_GEM_DOMAIN_GTT, 0);
> + }
>
> /*
> * We expect the kernel to limit the max fb @@ -638,7 +641,7 @@
> test_size_overflow(data_t *data)
> data->modifier));
>
> /*
> - * Try to hit a specific integer overflow in i915 fb size
> + * Try to hit a specific integer overflow in intel fb size
> * calculations. 256k * 16k == 1<<32 which is checked
> * against the bo size. The check should fail on account
> * of the bo being smaller, but due to the overflow the @@ -647,8
> +650,13 @@ test_size_overflow(data_t *data)
> igt_require(data->max_fb_width >= 16383 &&
> data->max_fb_height >= 16383);
>
> - bo = gem_buffer_create_fb_obj(data->drm_fd, (1ULL << 32) - 4096);
> -
> + if (is_i915_device(data->drm_fd))
> + bo = gem_buffer_create_fb_obj(data->drm_fd, (1ULL << 32) -
> 4096);
> + else
> + bo = xe_bo_create_flags(data->drm_fd, 0,
> + ALIGN(((1ULL << 32) - 4096),
> + xe_get_default_alignment(data-
> >drm_fd)),
> + vram_if_possible(data->drm_fd, 0));
> igt_require(bo);
>
> ret = __kms_addfb(data->drm_fd, bo,
> @@ -677,7 +685,7 @@ test_size_offset_overflow(data_t *data)
> data->modifier));
>
> /*
> - * Try to hit a specific integer overflow in i915 fb size
> + * Try to hit a specific integer overflow in intel fb size
> * calculations. This time it's offsets[1] + the tile
> * aligned chroma plane size that overflows and
> * incorrectly passes the bo size check.
> @@ -686,7 +694,13 @@ test_size_offset_overflow(data_t *data)
> DRM_FORMAT_NV12,
> data->modifier));
>
> - bo = gem_buffer_create_fb_obj(data->drm_fd, (1ULL << 32) - 4096);
> + if (is_i915_device(data->drm_fd))
> + bo = gem_buffer_create_fb_obj(data->drm_fd, (1ULL << 32) -
> 4096);
> + else
> + bo = xe_bo_create_flags(data->drm_fd, 0,
> + ALIGN(((1ULL << 32) - 4096),
> + xe_get_default_alignment(data-
> >drm_fd)),
> + vram_if_possible(data->drm_fd, 0));
> igt_require(bo);
>
> offsets[0] = 0;
> @@ -745,10 +759,15 @@ test_addfb(data_t *data)
> format, data->modifier,
> &size, &strides[0]);
>
> - bo = gem_buffer_create_fb_obj(data->drm_fd, size);
> + if (is_i915_device(data->drm_fd))
> + bo = gem_buffer_create_fb_obj(data->drm_fd, size);
> + else
> + bo = xe_bo_create_flags(data->drm_fd, 0,
> + ALIGN(size,
> xe_get_default_alignment(data->drm_fd)),
> + vram_if_possible(data->drm_fd, 0));
> igt_require(bo);
>
> - if (intel_display_ver(data->devid) < 4)
> + if (is_i915_device(data->drm_fd) && intel_display_ver(data->devid) <
> +4)
> gem_set_tiling(data->drm_fd, bo,
> igt_fb_mod_to_tiling(data->modifier), strides[0]);
>
> @@ -844,9 +863,9 @@ igt_main
> igt_fixture {
> drmModeResPtr res;
>
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL |
> DRIVER_XE);
>
> - igt_require(is_i915_device(data.drm_fd));
> + igt_require(is_intel_device(data.drm_fd));
>
> data.devid = intel_get_drm_devid(data.drm_fd);
>
> @@ -868,7 +887,11 @@ igt_main
> data.max_fb_width, data.max_fb_height);
>
> data.ram_size = igt_get_total_ram_mb() << 20;
> - data.aper_size = gem_aperture_size(data.drm_fd);
> +
> + if (is_i915_device(data.drm_fd))
> + data.aper_size = gem_aperture_size(data.drm_fd);
> + else
> + data.aper_size = (1ULL << xe_va_bits(data.drm_fd));
> data.mappable_size =
> gem_mappable_aperture_size(data.drm_fd);
>
> igt_info("RAM: %"PRIu64" MiB, GPU address space: %"PRId64"
> MiB, GGTT mappable size: %"PRId64" MiB\n", @@ -905,6 +928,10 @@ igt_main
> for (int i = 1; i < ARRAY_SIZE(modifiers); i++) {
> igt_subtest_f("%s-addfb-size-overflow",
> modifiers[i].name) {
> + /* No tiling support in XE. */
> + igt_skip_on(is_xe_device(data.drm_fd) &&
> + modifiers[i].modifier !=
> DRM_FORMAT_MOD_LINEAR);
> +
> data.modifier = modifiers[i].modifier;
> test_size_overflow(&data);
> }
> @@ -914,6 +941,10 @@ igt_main
> for (int i = 1; i < ARRAY_SIZE(modifiers); i++) {
> igt_subtest_f("%s-addfb-size-offset-overflow",
> modifiers[i].name) {
> + /* No tiling support in XE. */
> + igt_skip_on(is_xe_device(data.drm_fd) &&
> + modifiers[i].modifier !=
> DRM_FORMAT_MOD_LINEAR);
> +
> data.modifier = modifiers[i].modifier;
> test_size_offset_overflow(&data);
> }
> @@ -922,6 +953,10 @@ igt_main
> igt_describe("Sanity check if addfb ioctl works correctly for given size
> and strides of fb");
> for (int i = 0; i < ARRAY_SIZE(modifiers); i++) {
> igt_subtest_f("%s-addfb", modifiers[i].name) {
> + /* No tiling support in XE. */
> + igt_skip_on(is_xe_device(data.drm_fd) &&
> + modifiers[i].modifier !=
> DRM_FORMAT_MOD_LINEAR);
> +
> data.modifier = modifiers[i].modifier;
> test_addfb(&data);
> }
> @@ -939,8 +974,13 @@ igt_main
> igt_describe("Sanity check if addfb ioctl works
> correctly for given "
> "combination of modifier
> formats and rotation");
> igt_subtest_f("%s-%dbpp-rotate-%d",
> modifiers[i].name,
> - formats[j].bpp, rotations[k].angle)
> + formats[j].bpp, rotations[k].angle) {
> + /* No tiling support in XE. */
> + igt_skip_on(is_xe_device(data.drm_fd)
> &&
> + data.modifier !=
> DRM_FORMAT_MOD_LINEAR);
> +
> test_scanout(&data);
> + }
> }
>
> igt_fixture
> @@ -982,6 +1022,10 @@ igt_main
>
> igt_require(intel_display_ver(intel_get_drm_devid(data.drm_fd)) >= 5);
> data.max_hw_fb_width =
> min(data.hw_stride / (formats[j].bpp >> 3), data.max_fb_width);
>
> + /* No tiling support in XE. */
> +
> igt_skip_on(is_xe_device(data.drm_fd) &&
> + modifiers[i].modifier
> != DRM_FORMAT_MOD_LINEAR);
> +
> test_scanout(&data);
> }
>
> --
> 2.40.0
More information about the igt-dev
mailing list