Received-SPF: pass (google.com: domain of linux-kernel+bounces-26304-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To: <intel-xe@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>,
	<linux-kernel@vger.kernel.org>
CC: Rodrigo Vivi <rodrigo.vivi@intel.com>, Michal Wajdeczko
	<michal.wajdeczko@intel.com>, Maarten Lankhorst
	<maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>,
	Daniel Vetter <daniel@ffwll.ch>, Javier Martinez Canillas
	<javierm@redhat.com>, =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>,
	=?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v5 4/5] drm/tests: managed: Extract device initialization into test init
Date: Mon, 15 Jan 2024 18:13:50 +0100
Message-ID: <20240115171351.504264-5-michal.winiarski@intel.com>
In-Reply-To: <20240115171351.504264-1-michal.winiarski@intel.com>
References: <20240115171351.504264-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OWx2RmtUeFlKY3NzTzh6YXJpTUZ1YU1nQjZpQUZVaGZjUVpTZGtmOVV3Y1gz?=
 =?utf-8?B?WDVkdGJiZFUrMllXSnpqUFpseHA1WWQzeWZXVFlmZy9VZ1JSM2JFdnU4NW05?=
 =?utf-8?B?byt3czRPQnU0TlgxVUxSY2JGZXlqQ3Y2VzEweXNDdjRPdjhHT3hyaUVmOXhi?=
 =?utf-8?B?WTRZRjFVL2wyYWxKUTNzVTVYeFVrOGsrOVQzN2NWYlhQcG5xSGhXcE02UEtU?=
 =?utf-8?B?dHVDbmNIL2NiUGIyUXM2VWp3RExtM3VocVVMVTg4OGlCRTJjeDNaSVFRZ2l6?=
 =?utf-8?B?SVdhTmFldmNmdkRZVHoxSG8zanFNb2xJbXNvbWpCUzlZQzRpcWpFcjF3dytS?=
 =?utf-8?B?bVRoZmVLR1NTN1RSaGdLOFF0U3JVWk5ab0duQUVIZVZZMGtEVGJLQkdyNVBh?=
 =?utf-8?B?cDc0eTBkMldLcW9HakViWWZxT0FPRzZxTVpOTDhNL0t6VmlLMENubklYUUFC?=
 =?utf-8?B?a0J4RUs4Rm43WmxiS1NsYUVxNnRSTFZ5RlNFMmZPVGlQbWgzN2lCUHk1cEYv?=
 =?utf-8?B?dHZNRUQ2U0hubGU4NUtmM1A4TGN6cFZ3bkE3aUF5bWx6enhYN2NtcFU4K2Ni?=
 =?utf-8?B?OERseTdPQmFENllKNFpOYnVCaFZQYzlyUm1BWEw4UVY5cTZxNzM4YnJkSDJh?=
 =?utf-8?B?WE1mc1hIb25peWcySGlNbW9nTXRtakFOKzlTTk92YXR2WmVjLytxWkQ0K1Jp?=
 =?utf-8?B?anVpa1hvemtwUGRteGhLc2ZwdUJXZHNySksxbHVtOStZNW9SaXFFeXFGL3J4?=
 =?utf-8?B?M0ZURm5wUDlwSk1hZnRaT0NXQ3AyeXQxb2tBNzg4UTVGaWtUNDcxY0VnbnFC?=
 =?utf-8?B?SExvSVdjZzZsZDl1N09DL0d1aXRMREd3L2Q1YStyVkliYlNJQ2phWkdmK3lN?=
 =?utf-8?B?eDAvNDdYbDdPNXRIS1g4clR6OHJFSHI1R25KcXZ3YUNncXJGaEJuTWhYbGVz?=
 =?utf-8?B?Sm0rZlJHbGlWeEI2Q25WQ3FsdnpTZ1pWZGZWSGIzTjQ5SnZxRlJDMUo5Zndn?=
 =?utf-8?B?TFUzbnkvMTlSSHoydEVwNFIzTnVGQlZGSVhzUTcrUmlXV21KUUR2SUtNeFR5?=
 =?utf-8?B?bHZvVWlQdE5xeTg4TWIxMjVyVVcyZlNTZWVaM3YvdWhCUWxia1hMM2orUFRM?=
 =?utf-8?B?L3lib2w3K2VVUGFIOTBCWSs2RWlNMkxqbGtjL01aWk82OXl1N2UwUzFyUGxF?=
 =?utf-8?B?bTlUVUdESHN0amdhK1B0azh2eVM4OUhIM2RNTDV5aDgwWHcxeWJXdmtmKzcw?=
 =?utf-8?B?dWc1ZWhYUnpIN3dBMkpSZUphU2k4dEZibW1XRjJKck1WWW9qalBxZFhCYUJ3?=
 =?utf-8?B?NVpmLzBTOWVoT0VmRFZVWlBBV05ycHFYWExmSWlMem9kZWJKOXdHRjdNQlgx?=
 =?utf-8?B?UTlyeDRBL2xxTlBHKzlLOTJtTnV6Vkp4SXZMZFpIVGNIRTZUWEJjVTFEcFNv?=
 =?utf-8?B?bzdzTVY3RUFvT3JLemhidnFpU1lTQkl6SXdpcDBxZEg2clAzM0d5T0RidHZD?=
 =?utf-8?B?V0tKdWpmMStaa2V2QVhabFphR3VaajJ5allJQjkxbGpEN3ZSNXEyMXlOSmg0?=
 =?utf-8?B?M1EvREFlUHlHQlBpN0lDM2MrbjlKYU04ck5vczV1WVlKVHBBOTZRWXk4cnBx?=
 =?utf-8?B?ZC96Zks0UG9HMEZ6cDhhakY2TWx5Qzg0REdoVEVDeXBKdVBPK3RHM0dNUzFC?=
 =?utf-8?B?VzdacFpHb3JuMFJPdTArR0dWZ0VFOXloZE1ib21zWW9WeVVlMTh4bXo4L0ZN?=
 =?utf-8?B?anFIeGdLQk9aSFdmemEwR21saC9UdTR6UE1iYVVVTi9OWlpJeFdZN2tVSXd0?=
 =?utf-8?B?RSswS0l2dkZZa0dJNHBMYUdHOHExZjhwbWs0NWVsOUFsWWxidkdPZ2FYZEdp?=
 =?utf-8?B?OC9CL3hPbTFSNE1qNFl6bHZYbDBnSGpONkVwTjRDeHR0NHExcE9GSFhxMm1y?=
 =?utf-8?B?WTBkazBMSXYxZ1lEYloydnpPcVVrcWUxQVh2TVlCMFpDVmsvUENWZTllYzhF?=
 =?utf-8?B?OWw1cmw5Qmo3a1oxNFVXcHVtUm1WSkhpbTVLb1dRTzR5K2hscy9WV3M3WTBW?=
 =?utf-8?B?anRKdXlsWUw4d3M0SW1NWnBlYUtLT3hmdm5acU1oZzBhTGNFL052Qy9DbzJV?=
 =?utf-8?B?WEJvbHdXbkF4NTcyaTZRTGtMOGdFcHNSMUhTdTdGTkFpQ1dDMlZDTUtrakk1?=
 =?utf-8?B?Y0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e961c0ef-03c0-4849-f8cc-08dc15ed67ea
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2024 17:14:17.5568
 (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: h3TPc91/AQ9BU1FRnZuXiiGL7AsVaQ60PYJd9jZbLqVFlH1rBkyptd+CizSmVNzyac5+mH/+gfVyN7+V17WxD18ldfjD3wVCwv/GONcxLnY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6391
X-OriginatorOrg: intel.com

It simplifies the process of extending the test suite with additional
test cases without unnecessary duplication.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
---
 drivers/gpu/drm/tests/drm_managed_test.c | 41 +++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
index b5cf46d9f5cf8..d936c879a4a30 100644
--- a/drivers/gpu/drm/tests/drm_managed_test.c
+++ b/drivers/gpu/drm/tests/drm_managed_test.c
@@ -12,6 +12,7 @@
 #define TEST_TIMEOUT_MS	100
 
 struct managed_test_priv {
+	struct drm_device *drm;
 	bool action_done;
 	wait_queue_head_t action_wq;
 };
@@ -29,11 +30,28 @@ static void drm_action(struct drm_device *drm, void *ptr)
  * device is released.
  */
 static void drm_test_managed_run_action(struct kunit *test)
+{
+	struct managed_test_priv *priv = test->priv;
+	int ret;
+
+	ret = drmm_add_action_or_reset(priv->drm, drm_action, priv);
+	KUNIT_EXPECT_EQ(test, ret, 0);
+
+	ret = drm_dev_register(priv->drm, 0);
+	KUNIT_ASSERT_EQ(test, ret, 0);
+
+	drm_dev_unregister(priv->drm);
+	drm_kunit_helper_free_device(test, priv->drm->dev);
+
+	ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done,
+					       msecs_to_jiffies(TEST_TIMEOUT_MS));
+	KUNIT_EXPECT_GT(test, ret, 0);
+}
+
+static int drm_managed_test_init(struct kunit *test)
 {
 	struct managed_test_priv *priv;
-	struct drm_device *drm;
 	struct device *dev;
-	int ret;
 
 	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);
@@ -47,21 +65,13 @@ static void drm_test_managed_run_action(struct kunit *test)
 	 * to remain allocated beyond both parent device and drm_device
 	 * lifetime.
 	 */
-	drm = __drm_kunit_helper_alloc_drm_device(test, dev, sizeof(*drm), 0, DRIVER_MODESET);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, drm);
+	priv->drm = __drm_kunit_helper_alloc_drm_device(test, dev, sizeof(*priv->drm), 0,
+							DRIVER_MODESET);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);
 
-	ret = drmm_add_action_or_reset(drm, drm_action, priv);
-	KUNIT_EXPECT_EQ(test, ret, 0);
+	test->priv = priv;
 
-	ret = drm_dev_register(drm, 0);
-	KUNIT_ASSERT_EQ(test, ret, 0);
-
-	drm_dev_unregister(drm);
-	drm_kunit_helper_free_device(test, dev);
-
-	ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done,
-					       msecs_to_jiffies(TEST_TIMEOUT_MS));
-	KUNIT_EXPECT_GT(test, ret, 0);
+	return 0;
 }
 
 static struct kunit_case drm_managed_tests[] = {
@@ -71,6 +81,7 @@ static struct kunit_case drm_managed_tests[] = {
 
 static struct kunit_suite drm_managed_test_suite = {
 	.name = "drm_managed",
+	.init = drm_managed_test_init,
 	.test_cases = drm_managed_tests
 };
 
-- 
2.43.0