From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47134D637D1 for ; Wed, 13 Nov 2024 23:03:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DA6A10E77A; Wed, 13 Nov 2024 23:03:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="edaLnrsx"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9151F10E29B for ; Wed, 13 Nov 2024 23:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731538986; x=1763074986; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=hgqUNafMXojn9AWsTUt6z6/+9WXuuhIAy/0CjJwni4s=; b=edaLnrsx9Eam9I8+DENXeH9ijUXLNUwpYqsfAAloYEGgDgSuzz8te5lY zQTZd8fqL8tmD3rDvYLWXKk5TNCfIlP2TheizFoPU5HyFalo7U1xToxgk gqb5p7nWlT997ha2UHFmho8rvgs1WtlLKidTLDgiWlV2YlPGkmbz0AqS9 Oif2texSZKJ2wazRth4BrTtBlNJd53rU7VBTGvCkbk3jnwu8aGvOyV7hb Op7OaA9bxwZgG5i8Cu4KYUbMh3NoQjjwbqFH+5iGQd2kzI2/kygf1eu36 jxDWjb+QyP+SFilk+MV0CLlT3YOshSmgBfWhS85TkRiceQT2hofXM+8DZ Q==; X-CSE-ConnectionGUID: a26xS5/7QnWCAWRrE6R18g== X-CSE-MsgGUID: V/yybLtvRlCP/3n1rZ8G3g== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="53999376" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="53999376" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2024 15:03:05 -0800 X-CSE-ConnectionGUID: mVuqtExFSbiLP1eWoUMCAg== X-CSE-MsgGUID: 6bcjmrbcQsiUaqS0wWs+QA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,152,1728975600"; d="scan'208";a="93074716" Received: from cataylo2-desk.jf.intel.com ([10.165.21.140]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2024 15:03:05 -0800 From: Clint Taylor To: igt-dev@lists.freedesktop.org Subject: [PATCH i-g-t 5/9] XE3: tests/kms_addfb_basic: fix x-tiled tests for case when there is no x-tile Date: Wed, 13 Nov 2024 15:02:57 -0800 Message-Id: <20241113230301.655499-7-clinton.a.taylor@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241113230301.655499-1-clinton.a.taylor@intel.com> References: <20241113230301.655499-1-clinton.a.taylor@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" From: "Heikkila, Juha-pekka" On Xe3 display no more support x-tile and will disable such framebuffers Signed-off-by: Heikkila, Juha-pekka Signed-off-by: Clint Taylor --- tests/kms_addfb_basic.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index b22818592..3ba87117b 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -217,6 +217,12 @@ static int legacy_addfb(int fd, struct drm_mode_fb_cmd *arg) return err; } +static int addfb_expected_ret(igt_display_t *disp, struct drm_mode_fb_cmd2 *f) +{ + return igt_display_has_format_mod(disp, f->pixel_format, + f->modifier[0]) ? 0 : -1; +} + static void invalid_tests(int fd) { struct drm_mode_fb_cmd2 f = {}; @@ -735,8 +741,10 @@ static void addfb25_tests(int fd) igt_describe("Check if addfb2 call works for x-tiling"); igt_subtest("addfb25-x-tiled-legacy") { f.modifier[0] = I915_FORMAT_MOD_X_TILED; - do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &f); - do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id); + igt_assert_eq(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f), + addfb_expected_ret(&display, &f)); + if (!addfb_expected_ret(&display, &f)) + do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id); f.fb_id = 0; } @@ -756,12 +764,6 @@ static void addfb25_tests(int fd) gem_close(fd, gem_bo); } -static int addfb_expected_ret(igt_display_t *disp, struct drm_mode_fb_cmd2 *f) -{ - return igt_display_has_format_mod(disp, f->pixel_format, - f->modifier[0]) ? 0 : -1; -} - static void addfb25_ytile(int fd) { struct drm_mode_fb_cmd2 f = {}; @@ -1012,8 +1014,6 @@ igt_main master_tests(fd); - addfb25_tests(fd); - tiling_tests(fd); igt_subtest_group { @@ -1025,6 +1025,8 @@ igt_main igt_fixture igt_require_intel(fd); + addfb25_tests(fd); + addfb25_ytile(fd); addfb25_4tile(fd); -- 2.25.1