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 B511CC5DF80 for ; Tue, 18 Aug 2026 08:14:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 693A310E40A; Tue, 18 Aug 2026 08:14:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ctLbxj1U"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCACF10E40A for ; Tue, 18 Aug 2026 08:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1787040841; x=1818576841; h=message-id:date:subject:to:cc:references:from: in-reply-to:mime-version; bh=P211wLi7ZjseB2Z6Zu1tBaDh89462bzK2u8hz8nmbDQ=; b=ctLbxj1UzPsluZTZFHGUSlCj6zs8FcPgcrUYRh1FcXwWsXd4a+ilgOO+ W6v+cNYKmL2CO7INndd04N04H144bL92P8oaNSSG10RA5FO96aUhuWvA7 Xsk54FoT7PiMNxuNlF9cuzkEDe0vGDeEi2l2JJ9vIt0/s2cV8BRBtjH4u i9RAWLKbRsQLoZcC1K34bWzhxAOAi6cOjbc9p570PHic5PORQplPUUjkV 1L+PrqVJgTg21U+qj71YWDLeFOLJv9hBsm6rircwLIR2IIW6XOCY/U1V8 zMNyvVupF4OXL3tT0vO0QloJjqA0O8lF+/ybbznLmA1xqcD9WDrVnXJG1 A==; X-CSE-ConnectionGUID: 4sLRV7oGS/eN3J1aF/xioQ== X-CSE-MsgGUID: 3qgoyRoITfiAuHliuDCw0g== X-IronPort-AV: E=McAfee;i="6800,10657,11878"; a="87288494" X-IronPort-AV: E=Sophos;i="6.25,230,1779174000"; d="scan'208,217";a="87288494" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2026 01:14:00 -0700 X-CSE-ConnectionGUID: vpbZe23ORbOhlIwk/Qbm1A== X-CSE-MsgGUID: Nx+56VlTS6W+F3bpN4XvEA== X-ExtLoop1: 1 Received: from fmsmsx902.amr.corp.intel.com ([10.18.126.91]) by fmviesa003.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2026 01:14:00 -0700 Received: from FMSMSX901.amr.corp.intel.com (10.18.126.90) by fmsmsx902.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 18 Aug 2026 01:13:59 -0700 Received: from fmsedg903.ED.cps.intel.com (10.1.192.145) by FMSMSX901.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45 via Frontend Transport; Tue, 18 Aug 2026 01:13:59 -0700 Received: from CH1PR05CU001.outbound.protection.outlook.com (52.101.193.34) by edgegateway.intel.com (192.55.55.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Tue, 18 Aug 2026 01:13:59 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GW0O8tH5tYaPZrdS1x89FadYjpk5iABUeXlHPUCf+ZB/XM2dCAvG9gSW/gpyoyAI+J1RGpfYVsvmTlDo1Y5r3iC7jbPu0d1b3GkyZh7nE0oLEZ9cYIVFcHqCyVgzNcU5A7Z39y7dEXcqy7sGz7jXfWTEQLrhPChlbWbzat3nDODHf4ICJ6UFXC+hD5KJ+gRFBcD8TIWADn8CDdnNohZJN43kQs8Xed8EGjffVpgFs1/iIku+6rTJ/nZZoQLYrq1dfM7sC7Bw3MpsfBX+Y2aDl6/dBQQreARgWhVPv46TsFJofoaoxC6Zj2M0JJZQFZO34iqyRGGPoURimdrmx3zq5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QfhzeyOWeKjSIhI8R7ZgRt1cIuMiGaImFaPHw8mSc6s=; b=MGoIbtZ8V38pAjlcL6q4QfEGmT7zVLW3534hownCKDtGma3afJPWDRY9HRYRdTEJZHsO1Ekk4t4UtpJO2eej0Mrvc4zUexiqVuTO8P55+AewNuL4d0dOZtOP8eb4HqxvDdX8Do3ysMtsBLUffnR+lbPgAYiftshEADa3PwZqmfkav/lRyXkUHF/QHO2t9kJMIsng3JLMFvMXZg01tyP93s/oIzsenG+/UdesP3avk+ewJT89xFYlluKGlQo3B7nG67MClpUfvEbwqYRgpJrpBVnFBayhT7m9/TozwEOKShcdYdXDZDxeYnvAuiGg5xm7CSFfi56EeTS1p9MILAdE+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from CO1PR11MB4913.namprd11.prod.outlook.com (2603:10b6:303:9f::20) by IA1PR11MB6346.namprd11.prod.outlook.com (2603:10b6:208:38a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Tue, 18 Aug 2026 08:13:56 +0000 Received: from CO1PR11MB4913.namprd11.prod.outlook.com ([fe80::938d:6d4c:e26f:ed03]) by CO1PR11MB4913.namprd11.prod.outlook.com ([fe80::938d:6d4c:e26f:ed03%5]) with mapi id 15.21.0339.007; Tue, 18 Aug 2026 08:13:54 +0000 Content-Type: multipart/alternative; boundary="------------F5vdspZVK1oaYHoDNwcH0hd8" Message-ID: Date: Tue, 18 Aug 2026 13:43:45 +0530 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH i-g-t v2 05/16] tests/kms_frontbuffer_tracking: remove TEST_MODE_ITER_BEGIN() from `suspend` To: =?UTF-8?Q?Micha=C5=82_Grzelak?= , CC: , References: <20260807224746.3554064-1-michal.grzelak@intel.com> <20260807224746.3554064-6-michal.grzelak@intel.com> Content-Language: en-GB From: "Thasleem, Mohammed" In-Reply-To: <20260807224746.3554064-6-michal.grzelak@intel.com> X-ClientProxiedBy: MA5P287CA0124.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1d0::13) To CO1PR11MB4913.namprd11.prod.outlook.com (2603:10b6:303:9f::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4913:EE_|IA1PR11MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: a1a620d8-48fa-4136-5238-08defd00a451 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|23010399003|376014|366016|1800799024|56012099006|10067099003|4143699003|5023799004|11063799006|8096899003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: lePdujwkId78lJKkF8Dy2PowMDBc6jBw9TBcrjbAdL6m8xwcy2ZTA2adRiuVZB63dvSFb4NLrteD4vLIa2+6nQW7d31rBBq/BlxnWIfi26IrPsEVbWYxn7b2hHtXQMBMnMadJuOAk4VGe1fZk4whwqpfHJzgk/+105WenfKk8EfQKcjOGqlg8sOkILbBsijArKmr7/dpZOMrzVwS/ceQbDYh4VTADhhaluCk8tyzCykg/cyNlfNjs9WVb2zcLFqJxN897LMsXkBIR+/89D18tSkE/JCL/tFDN3QLrDJH2Uukfh4CiK2to5Ejm3zlAGXks0dytPiNj33GE6mhJV4u1RiLtpUy+2xXV+SDol2zapbEzHK56BTiiiEtcDC0lt4rnmu5DzZHjvQhTyipnttJ6uomR/OK9qTg2kdKVcbJRElcDuW2fOLOmW4qXyT4Kn29X2DbDBO+CzZBp3haoPk3TdPaauH84Y5c0Uh+lejkXZcAagOErnV1HNOX7GJsAxLkYHLehq4js81TnKCMtrHm17LG/Jo79tAqJ3J1nse7LOMztIuKoi4Qgf5YtFKtzHG0WhGvxQ01Pk7dtuu6jN9ECoBVQs4wS6wRMyEA0qVtFuDRW1FEwvhTrqgeCPQt8NpXkg0NOHpukGi7yg0G3j/MdlHdpUqrMvjcc/dp4QDdYIA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO1PR11MB4913.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(23010399003)(376014)(366016)(1800799024)(56012099006)(10067099003)(4143699003)(5023799004)(11063799006)(8096899003)(22082099003)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L1VtZ3BGN1ZWcW5nOUtUWVlETjdtbzE4SjVWQy9PVU9MV3d3M3VSTU1NeFhs?= =?utf-8?B?RWFQQURad2JJVUl5QTVGWUNVVlhBY25YUEFQOThtRzR6U1pBS0dKem81MlhO?= =?utf-8?B?Rkl2eUdYRzZ0bmVUSURZQjdNZHpYaDlKcENzcHdTdGI1TUx3VS83cVlXd1Iv?= =?utf-8?B?a0pQSkF3U3pKMWhiWFhYRCtYQnkwL3RGb3BZWUg3dE9qN1d2MVZhRVI4TWw1?= =?utf-8?B?dDkrRW84SXpsY1FwSmFIT0ZsaGpKTjFsdW1VUE5mTCtHWUYyOXNPRlRnakhB?= =?utf-8?B?dXlkS3dqMVRaY1NUMHZYcTduYnRYRHNjN1F6RTFFSjlURmZMMmsrTzE3Vkxk?= =?utf-8?B?eE0zdTZwVmVLeDZWQnNZcEFvRUFzenE3SXUxN3NYRkRMdGRsY2VEcFJUODNa?= =?utf-8?B?K2VZK01QWEdFaFZ5cFh3OHlaL01NR3l5WVRlTHg5aHI4Z29telZnMSt3SHBE?= =?utf-8?B?S1NFQVRkYjNkK3Z5R2JaVmVjQyttT1RZNFpwWHkyakNycGJFMG1XOGJVSzJQ?= =?utf-8?B?L29rdzZ4djBZbFZMbERzeE5jSEwyT1JPd0ZTUUdQdXZMdzdvbjhvZnJTaVMw?= =?utf-8?B?ZU4rdjM0RlRPT3U0L1A0bCtiYnRrZWc4Vlh2YldLMWtuZ2w2dnRoK3UxcXlT?= =?utf-8?B?dGEzK3oxNm52R0k5TlFXRWd5RFRmdXcraEVmczZ6SXhMV0s0akpXZFVqWVNI?= =?utf-8?B?aGg1dGtZdHUwYVcyNTdoU1VzSTZTMHd5RmRmOGZPYkNpVjAyRmtiL0VKY1Qz?= =?utf-8?B?YWZqRUtiRC9VRGdQZ3RHZTNVK0ZyMVQxaGlZaWdwVWFxYTNHRXJGLzlBWnFL?= =?utf-8?B?bEw1TjQzSno4N01yNnFaMjZ5VFFXcUdtUFFSSHlYNjBad25vcDNsTVZ3ZnFl?= =?utf-8?B?WWUxdmhZYnNmZTBjaUpPa3IyUytITFdyMzRyTzNrVVhvTzM4dzlQd0dTNDV3?= =?utf-8?B?Rzg3a2JEbFRBNFpKZERYamVzZXVWU0FRSlJNTnh0REFiVThLNjRzNE92a3FZ?= =?utf-8?B?ZmJxZ2FGMDhxV2tDMGlNbndKeXBEUkxYTXE2MXNLN01adHhwcWl3eERVczRY?= =?utf-8?B?YVB3bVdrc3gvTmpTQ2gvUCs1TUVuMEJBbEF1TXB6RWcrcjZUWlM2Q3QwLy91?= =?utf-8?B?RUhwK3MrWXNnbUpRMHE4S1o0SGkxWU9mbDhNRFY3MndLNko5RkdJMlJQNFEy?= =?utf-8?B?bklqM0dNaFQrN2xubHgrWmlwR0o5V3EwK2lnY2Q3ZmoxMVZSbGlPMlVkcU12?= =?utf-8?B?M2NuV003ckhvZytwanNvcTlESlFQQU9nYVJRRHZYVmprOHVFbHZUVkgxVUpE?= =?utf-8?B?OUkwWU0xVDhwcSswR21sb09uTlFjZ1pNUlo4ejRYT2M2VWtYNnlvbHZzVEtX?= =?utf-8?B?VzM4SVAzNlN2SUtJZVlvWXlaQnh4M1FpdUxwcUQrRDlhWis0Z2FPWUt2dHVM?= =?utf-8?B?UExJQy8xL2t2Z3pHbmpxVFdCa2RsV29TY09UQm5kWVlFbFgzeWhXeEd2L2Vi?= =?utf-8?B?QWRUY1NyTUZJMU9EUkRSTFNLbUZkTzNSMXpsQ2tFK2ZoODZDdXJqbDRFY2dv?= =?utf-8?B?RE1JdGRnSDFFcVFOMHF6L2FmYlhqaUMya05sOXV5R05ndVhod3dweXYyUnZS?= =?utf-8?B?MG5jWXJPKzdlL1JKa2lLMHNmc0V3ZEFwOGplUzNUUnVpOUN5RlVzQ2tRZW9k?= =?utf-8?B?djRkd3lJU2dUZWZZQ3VXRndQTHFzaW9BK3VwM3p1RUtnd2orQ3YvYVY2Y3py?= =?utf-8?B?RXk3bEhYcm1rZUZqWnFZVmxQWlhXdTZleDJMcDd5a0xZcGFYWDBXajBvOTUx?= =?utf-8?B?YkVmQ3I2djUyQkVPT1ZKeUVwWHVidG1uR1hvR1pGQU9Uc3lQVFVOUFI4Y2la?= =?utf-8?B?MU9sNU03ZEcyMzNSZlM0VE90bzFSVTZDTmw1a2xvYlNWWjVOL3pwaTZVRlhY?= =?utf-8?B?MnUwalJRbW03YjhUN0doSGZTaHlXdWg2N09IbXJxa0FDT2FoeDVVY2VXK0o4?= =?utf-8?B?K3pBYzFNSzlrdno1dDFHblBNREZXZ0JaMVhVY0F5R3NrdCtGTGNqK1F4VmY1?= =?utf-8?B?eS9DSmxyZXJHeUJvNDlJTytGczdzcGYwb2tWVDNzeUkvNFRVK00xUHp5d0ZM?= =?utf-8?B?b0tDV2VtWWJjd0wvZWV0QmlEejBlS1ZmRUJ0VXNWL2N2T2ltWWlyakFPb2xW?= =?utf-8?B?dFFudUovRjNDL1N3cTEzS0ZpOHlyT2ozajFINU1wU0daU3lubHNBdjF5OTl4?= =?utf-8?B?YXVDdzdVRjhsTzBRa29qOEpWVHU1MU1EblVYMHFUTk51amdlZ3ZSVC90L2pK?= =?utf-8?B?anBqcUZ2SUJhNXVNOVRZazgxTm1CdHJ5Y2JHSUxMcjd4NUxHZWZZb1lZTklN?= =?utf-8?Q?p67IReayq6ZtbC5w=3D?= X-Exchange-RoutingPolicyChecked: YH/8I4cKteFW11bKcHuGleKtjW8tbh0+SZlDVTIHGSfYaYSwtKEkTSezzmv5dT/tDZpJTW9GbuwVuKx/vWUkylik0RzDvgKJ6Dp5c4qVeNaNZSnMTid+D1tt2PE1aNkCUuve9SmHMpZ1mV0CKvpEDMHCvLCyHly2s/umXKkPdqubZdKaXZ2tLpuLbEtotQ9ORUtj0a3QN2by2xi2+Z+LNf58yGZ8e/QtukYVPvBygABQkRgfESKCt3m7jqHkbj9C7ivD1aeyUK4zHR/VDzq7oJ0+HlsVBqTTyuTMmi1pWJjh1qqKsUtXRYZFKi/0CksH+9a0KAMP7+YnbHHn49zB1g== X-MS-Exchange-CrossTenant-Network-Message-Id: a1a620d8-48fa-4136-5238-08defd00a451 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4913.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2026 08:13:54.6786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FTs6WBUeILXN6EAFSP+rjfUMfyPlK3d+94QMSSKQuGNYHwsccnYDFr7b5VewdyvB9o5Y/uKZrEV/7cBMLsK5VF8QP9kxeeMccH+W+U6BzNM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6346 X-OriginatorOrg: intel.com 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" --------------F5vdspZVK1oaYHoDNwcH0hd8 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit On 08-08-2026 04:17 am, Michał Grzelak wrote: > igt@kms_frontbuffer_tracking uses TEST_MODE_ITER_BEGIN(t) which consists > of nested for loops. However many loops can be omitted due to continue > statements. This obfuscates following the execution of any given > codepath. Replace TEST_MODE_ITER_BEGIN(t) for fliptrack tests with macro > definition and remove loops that are skipped. > > v1->v2 > - remove blank line (Mohammed) > > Signed-off-by: Michał Grzelak LGTM: Reviewed-by: Mohammed Thasleem > --- > tests/intel/kms_frontbuffer_tracking.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/tests/intel/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c > index c2130d76a2..406018c88a 100644 > --- a/tests/intel/kms_frontbuffer_tracking.c > +++ b/tests/intel/kms_frontbuffer_tracking.c > @@ -4626,12 +4626,19 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL) > } > TEST_MODE_ITER_END > > - TEST_MODE_ITER_BEGIN(t) > - if (t.pipes != PIPE_SINGLE || > - t.screen != SCREEN_PRIM || > - t.plane != PLANE_PRI || > - t.fbs != FBS_INDIVIDUAL || > - t.method != IGT_DRAW_BLT) > + t.format = FORMAT_DEFAULT; > + t.flip = FLIP_PAGEFLIP; > + t.tiling = opt.tiling; > + t.pipes = PIPE_SINGLE; > + t.screen = SCREEN_PRIM; > + t.plane = PLANE_PRI; > + t.fbs = FBS_INDIVIDUAL; > + t.method = IGT_DRAW_BLT; > + > + for (t.feature = 0; t.feature < FEATURE_COUNT; t.feature++) { > + if (!opt.show_hidden && t.feature == FEATURE_NONE) > + continue; > + if ((t.feature & FEATURE_PSR) && (t.feature & FEATURE_DRRS)) > continue; > > igt_subtest_f("%s-modesetfrombusy", feature_str(t.feature)) > @@ -4692,7 +4699,7 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL) > igt_require(igt_draw_supports_method(drm.fd, t.method)); > suspend_subtest(&t); > } > - TEST_MODE_ITER_END > + } > > t.pipes = PIPE_SINGLE; > t.screen = SCREEN_PRIM; --------------F5vdspZVK1oaYHoDNwcH0hd8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: 8bit


On 08-08-2026 04:17 am, Michał Grzelak wrote:
igt@kms_frontbuffer_tracking uses TEST_MODE_ITER_BEGIN(t) which consists
of nested for loops. However many loops can be omitted due to continue
statements. This obfuscates following the execution of any given
codepath. Replace TEST_MODE_ITER_BEGIN(t) for fliptrack tests with macro
definition and remove loops that are skipped.

v1->v2
- remove blank line (Mohammed)

Signed-off-by: Michał Grzelak <michal.grzelak@intel.com>
LGTM:

Reviewed-by: Mohammed Thasleem <mohammed.thasleem@intel.com>

---
 tests/intel/kms_frontbuffer_tracking.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/intel/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
index c2130d76a2..406018c88a 100644
--- a/tests/intel/kms_frontbuffer_tracking.c
+++ b/tests/intel/kms_frontbuffer_tracking.c
@@ -4626,12 +4626,19 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL)
 		}
 	TEST_MODE_ITER_END
 
-	TEST_MODE_ITER_BEGIN(t)
-		if (t.pipes != PIPE_SINGLE ||
-		    t.screen != SCREEN_PRIM ||
-		    t.plane != PLANE_PRI ||
-		    t.fbs != FBS_INDIVIDUAL ||
-		    t.method != IGT_DRAW_BLT)
+	t.format = FORMAT_DEFAULT;
+	t.flip = FLIP_PAGEFLIP;
+	t.tiling = opt.tiling;
+	t.pipes = PIPE_SINGLE;
+	t.screen = SCREEN_PRIM;
+	t.plane = PLANE_PRI;
+	t.fbs = FBS_INDIVIDUAL;
+	t.method = IGT_DRAW_BLT;
+
+	for (t.feature = 0; t.feature < FEATURE_COUNT; t.feature++) {
+		if (!opt.show_hidden && t.feature == FEATURE_NONE)
+			continue;
+		if ((t.feature & FEATURE_PSR) && (t.feature & FEATURE_DRRS))
 			continue;
 
 		igt_subtest_f("%s-modesetfrombusy", feature_str(t.feature))
@@ -4692,7 +4699,7 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL)
 			igt_require(igt_draw_supports_method(drm.fd, t.method));
 			suspend_subtest(&t);
 		}
-	TEST_MODE_ITER_END
+	}
 
 	t.pipes = PIPE_SINGLE;
 	t.screen = SCREEN_PRIM;
--------------F5vdspZVK1oaYHoDNwcH0hd8--