From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (unknown [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id B040C10E53B for ; Wed, 2 Aug 2023 10:28:26 +0000 (UTC) From: Bhanuprakash Modem To: igt-dev@lists.freedesktop.org Date: Wed, 2 Aug 2023 15:50:46 +0530 Message-Id: <20230802102059.3650360-5-bhanuprakash.modem@intel.com> In-Reply-To: <20230802102059.3650360-1-bhanuprakash.modem@intel.com> References: <20230802102059.3650360-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [i-g-t V2 04/17] tests/kms_addfb_basic: Add tiling support 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: Remove the tiling restrictions in Xe specific tests 8c3b02be3 (tests/kms_addfb_basic: Add XE support) Signed-off-by: Bhanuprakash Modem --- tests/kms_addfb_basic.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 065f21975..9a6344376 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -391,7 +391,7 @@ static void tiling_tests(int fd) igt_subtest_group { igt_fixture { - igt_require_i915(fd); + igt_require_intel(fd); tiled_x_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, DRM_FORMAT_XRGB8888, I915_FORMAT_MOD_X_TILED, 1024*4, NULL, NULL, NULL); @@ -410,7 +410,8 @@ static void tiling_tests(int fd) f.pitches[0] = 1024*4; igt_describe("Check if addfb2 and rmfb call works for basic x-tiling test"); igt_subtest("basic-x-tiled-legacy") { - igt_require(gem_available_fences(fd) > 0); + if (is_i915_device(fd)) + igt_require(gem_available_fences(fd) > 0); f.handles[0] = tiled_x_bo; do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &f); @@ -420,6 +421,7 @@ static void tiling_tests(int fd) igt_describe("Check if addfb2 call works for x and y tiling"); igt_subtest("framebuffer-vs-set-tiling") { + igt_require_i915(fd); igt_require(gem_available_fences(fd) > 0); f.handles[0] = gem_bo; @@ -434,6 +436,7 @@ 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") { + igt_require_i915(fd); igt_require(gem_available_fences(fd) > 0); f.handles[0] = tiled_x_bo; @@ -443,8 +446,12 @@ 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") { - igt_require(!gem_has_lmem(fd)); - igt_require(gem_available_fences(fd) > 0); + 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)); + } f.handles[0] = tiled_y_bo; do_ioctl_err(fd, DRM_IOCTL_MODE_ADDFB2, &f, EINVAL); @@ -995,7 +1002,7 @@ igt_main size_tests(fd); igt_fixture - igt_require_i915(fd); + igt_require_intel(fd); addfb25_ytile(fd); -- 2.40.0