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 C103AE9A049 for ; Sat, 21 Feb 2026 03:20:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 742D910E109; Sat, 21 Feb 2026 03:20:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HYkN6V2W"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C6AD10E10E for ; Sat, 21 Feb 2026 03:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1771644043; x=1803180043; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=npTNoW2Zd869dJhNHOg9VapFRy7Ff7z+q/EyGxGeutY=; b=HYkN6V2WEECTyQbNma8Uq6hG1+94smZety4tK4eL8yEH0iYj/EHZ9PSg yPaJCQSDoL75v6m6tnncFJmUkooBNKK1KwCgbiI9qo5rgQf/epTHBeloP p91lKLNqOxU2J+Ive7Y+Hk6yfcIrr88/q3tgNU9yIgmvsUPHASm7Xt1ND c1NULd3CYA3D84bbSp4hZyq4cXgLnHAzKoS5vKterK+1dyC6lgjk6JZ6s BXcuDsGOy+PQw06AHpgkE69hJFq7g3xdDhAH2cK8vHFC323hiiVWEkYqY QUv9ywJnr0vkrPFoHlLVP4ZXTky8h56Pi+FDHdhJ0iQzcd7TRHwKOUUxW g==; X-CSE-ConnectionGUID: Eeh0oV+3Que/i2/i12IurQ== X-CSE-MsgGUID: IZWD+GoBTp64kUjlBj3M6w== X-IronPort-AV: E=McAfee;i="6800,10657,11707"; a="84187195" X-IronPort-AV: E=Sophos;i="6.21,302,1763452800"; d="scan'208";a="84187195" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2026 19:20:43 -0800 X-CSE-ConnectionGUID: xasYQeX2Ssul9q6O74bCzA== X-CSE-MsgGUID: pfKoPGSoSlWTR5G4CvOgqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,302,1763452800"; d="scan'208";a="214256391" Received: from vpanait-mobl.ger.corp.intel.com (HELO localhost) ([10.245.245.139]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2026 19:20:42 -0800 From: Ville Syrjala To: igt-dev@lists.freedesktop.org Subject: [PATCH i-g-t v2 09/23] tests/kms_lease: Pass lease_t to prepare_crtc() Date: Sat, 21 Feb 2026 05:19:48 +0200 Message-ID: <20260221032003.30936-10-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260221032003.30936-1-ville.syrjala@linux.intel.com> References: <20260221032003.30936-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland 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: Ville Syrjälä cleanup_crtc() gets passed the appropriate lease_t directly by the caller, but prepare_crtc() instead takes the same information as a boolean flag (and picks the appropriate lease_t based on that). Unify the approach to also pass the appropriate lease_t directly to prepare_crtc(). Signed-off-by: Ville Syrjälä --- tests/kms_lease.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/kms_lease.c b/tests/kms_lease.c index 045cd62de0d7..9f7935e99902 100644 --- a/tests/kms_lease.c +++ b/tests/kms_lease.c @@ -147,10 +147,9 @@ static igt_output_t *connector_id_to_output(igt_display_t *display, uint32_t con return igt_output_from_connector(display, &connector); } -static int prepare_crtc(data_t *data, bool is_master) +static int prepare_crtc(data_t *data, lease_t *lease) { drmModeModeInfo *mode; - lease_t *lease = is_master ? &data->master : &data->lease; igt_display_t *display = &lease->display; igt_crtc_t *crtc = igt_crtc_for_crtc_id(display, data->crtc_id); igt_output_t *output = connector_id_to_output(display, data->connector_id); @@ -315,7 +314,7 @@ static void simple_lease(data_t *data) igt_display_require(&data->lease.display, data->lease.fd); /* Set a mode on the leased output */ - igt_assert_eq(0, prepare_crtc(data, false)); + igt_assert_eq(0, prepare_crtc(data, &data->lease)); /* Paint something attractive */ paint_fb(data->lease.fd, &data->lease.primary_fb, "simple-lease", @@ -364,7 +363,7 @@ static void page_flip_implicit_plane(data_t *data) drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); /* Set a mode on the leased output */ - igt_assert_eq(0, prepare_crtc(data, true)); + igt_assert_eq(0, prepare_crtc(data, &data->master)); /* sanity check */ do_or_die(drmModePageFlip(data->master.fd, data->crtc_id, @@ -436,7 +435,7 @@ static void setcrtc_implicit_plane(data_t *data) } /* Set a mode on the leased output */ - igt_assert_eq(0, prepare_crtc(data, true)); + igt_assert_eq(0, prepare_crtc(data, &data->master)); /* sanity check */ ret = drmModeSetCrtc(data->master.fd, data->crtc_id, -1, @@ -477,7 +476,7 @@ static void cursor_implicit_plane(data_t *data) drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); /* Set a mode on the leased output */ - igt_assert_eq(0, prepare_crtc(data, true)); + igt_assert_eq(0, prepare_crtc(data, &data->master)); /* sanity check */ do_or_die(drmModeSetCursor(data->master.fd, data->crtc_id, 0, 0, 0)); @@ -788,7 +787,7 @@ static void lease_revoke(data_t *data) igt_assert_eq(revoke_lease(data->master.fd, &mrl), 0); /* Try to use the leased objects */ - ret = prepare_crtc(data, false); + ret = prepare_crtc(data, &data->lease); /* Ensure that the expected error is returned */ igt_assert_eq(ret, -ENOENT); -- 2.52.0