From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5AAFE10E762 for ; Thu, 23 Nov 2023 14:08:23 +0000 (UTC) From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: igt-dev@lists.freedesktop.org Date: Thu, 23 Nov 2023 16:08:07 +0200 Message-Id: <20231123140807.1889536-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v3] tests/kms_addfb_basic: Skip not relevant subtests for Xe List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Skip following tests for Xe: tile-pitch-mismatch addfb25-x-tiled-mismatch-legacy They are not relevant for Xe as tiling information is not encoded into backing object. Skip following test for Xe basic-y-tiled-legacy As Xe supports y-tiled format on legacy addfb. v3: - Closes tag added to commit message - Cc tags added to commit message v2: Commit message subject modified Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/609 Cc: Juha-Pekka Heikkila Cc: Swati Sharma Signed-off-by: Jouni Högander --- tests/kms_addfb_basic.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index fc16b8814..426277422 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -396,7 +396,7 @@ static void pitch_tests(int fd) /** * SUBTEST: basic-%s-tiled-legacy * Description: Check if addfb2 and rmfb call works for basic %arg[1] test - * Driver requirement: i915, xe + * Driver requirement: i915 * Test category: functionality test * Functionality: kms_gem_interop, tiling * Mega feature: General Display Features @@ -410,7 +410,7 @@ static void pitch_tests(int fd) * * SUBTEST: tile-pitch-mismatch * Description: Test that addfb2 call fails correctly for pitches mismatch - * Driver requirement: i915, xe + * Driver requirement: i915 * Test category: functionality test * Functionality: kms_gem_interop, tiling * Mega feature: General Display Features @@ -478,8 +478,8 @@ static void tiling_tests(int fd) igt_describe("Test that addfb2 call fails correctly for pitches mismatch"); f.pitches[0] = 512*4; igt_subtest("tile-pitch-mismatch") { - if (is_i915_device(fd)) - igt_require(gem_available_fences(fd) > 0); + igt_require_i915(fd); + igt_require(gem_available_fences(fd) > 0); f.handles[0] = tiled_x_bo; do_ioctl_err(fd, DRM_IOCTL_MODE_ADDFB2, &f, EINVAL); @@ -488,12 +488,10 @@ static void tiling_tests(int fd) igt_describe("Test that addfb2 call fails correctly for basic y-tiling test"); f.pitches[0] = 1024*4; igt_subtest("basic-y-tiled-legacy") { - if (is_i915_device(fd)) { - igt_require(!gem_has_lmem(fd)); - igt_require(gem_available_fences(fd) > 0); - } else { - igt_require(!xe_has_vram(fd)); - } + igt_require_i915(fd); + igt_require(!gem_has_lmem(fd)); + igt_require(gem_available_fences(fd) > 0); + f.handles[0] = tiled_y_bo; do_ioctl_err(fd, DRM_IOCTL_MODE_ADDFB2, &f, EINVAL); @@ -682,7 +680,7 @@ static void size_tests(int fd) * * SUBTEST: addfb25-x-tiled-mismatch-legacy * Description: Test that addfb2 call fails correctly for irrelevant x-tiling - * Driver requirement: i915, xe + * Driver requirement: i915 * Test category: functionality test * Functionality: kms_gem_interop, tiling * Mega feature: General Display Features @@ -752,6 +750,7 @@ static void addfb25_tests(int fd) igt_describe("Test that addfb2 call fails correctly for irrelevant x-tiling"); igt_subtest("addfb25-x-tiled-mismatch-legacy") { + igt_require_i915(fd); f.modifier[0] = DRM_FORMAT_MOD_LINEAR; do_ioctl_err(fd, DRM_IOCTL_MODE_ADDFB2, &f, EINVAL); } -- 2.34.1