Received-SPF: pass (google.com: domain of linux-kernel+bounces-17724-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
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 v4 5/6] drm/tests: managed: Extract device initialization into test init
Date: Fri, 5 Jan 2024 11:13:23 +0100
Message-ID: <20240105101324.26811-6-michal.winiarski@intel.com>
In-Reply-To: <20240105101324.26811-1-michal.winiarski@intel.com>
References: <20240105101324.26811-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?S0Y4ZHZCMzZTT0k4VFM0NDdLUWZxM3ZLRUEwalYxV0c4TUxOQ04yaHN0d1Vs?=
 =?utf-8?B?cDZ1T0tzQ0JJM3NaK00vSWdaeVBWU2EvQUVMYklzTlhXODFUa3NjeEdCUnpV?=
 =?utf-8?B?d3c4WHBXcVp5VnZwdFcrSU5uVlVBb09mSWNCckVMdXplWkZ2ZEs1aTVvVFRC?=
 =?utf-8?B?Ukg3bDlOa0lVRkM5L29SUU5rNGluaW8vTjRLV3ZqN3p2b0trQlpPNytJWjRK?=
 =?utf-8?B?UVMrVkpJN2VvRkZlazFxVHZJREpwREVSYy8wYVI5RzVmeHJrODBNNVZna3U0?=
 =?utf-8?B?a1Y3Q29rUFRBdDk3L1dQSmRtYXpsZldVK1k2TXY1QWdrUnROdjJ3b1V3MFlG?=
 =?utf-8?B?YzBPbDI5ekoyZy8yNTBiN0MwOVYxRWhCNjRkUi9EMkpreGIrL21QUFZVb1Ry?=
 =?utf-8?B?K2NMNVc5SkhzWG83cnJxMkV3KzFKclNSdEZhK25BYVBocWRWMFkyNTExUWdO?=
 =?utf-8?B?VUxveFp5RmsrazRFKzE4VEd1R01tazRVSnF6b0lVQlNoRXZDRnZoa0x0QXhs?=
 =?utf-8?B?NE9Td1JmOEt0aFlUTUpKK1pucXUwWmRHMUZnaHBpNERvWUlvWllFTkwzaUJy?=
 =?utf-8?B?YythTDhWa2Y3WDFvdFBGR0NnMmxtbFArbWc2THJMYUFpVnl4Vms1blNzMGs1?=
 =?utf-8?B?VG1vNGdIbmtwOEh2bDNTTDJKa05QeWVrRmN1WGN4aU9hTWdJdmw0Zng3UWh2?=
 =?utf-8?B?ai9TbVZ2anRNYVlFVXp1RXZHeEp4T1lHKzlQU0JtNXBZYjI0RE9tQitGUFQy?=
 =?utf-8?B?NERHYjlkR1Q0akF3UmtWRUJ4cUh4MFFPelg3QVBlMnp1RnBINGpZNUk1bG9W?=
 =?utf-8?B?TE9yeThoZTlzWFNsbG9IZXZVc0R1U253WFZDUG9XSkNSRnVkQklRV3pLc1lV?=
 =?utf-8?B?c2FuOWtHaUpjWGtuZ0Z1ekNRNFJFSmlLRHlRcHV3d1Rxd0F3SnozalJESG5m?=
 =?utf-8?B?aTlYU1BqdlhpYk5HeHo4VUZuQkN6Ny9QQ1lUNWdGc3JTODVkSGJENEl5UDJv?=
 =?utf-8?B?cEhabnNmRlNlVHVoZU5NK2xyWjU3ek1pa011MGQ5cjFEMWthTStLYmtwenA3?=
 =?utf-8?B?dTV2V0JiRnl1Mm9JZmVlMTdKcG9Fd0dGQ0FOa2N2dG9pdlNYSll2SVJmMWJY?=
 =?utf-8?B?WU5lMzZFdGZ2UFk1SmJJdWYwYzE3STlEeEtnWEUxSXhUMGw2UGhjZ1lUdENz?=
 =?utf-8?B?NXNjZ1ZjNE5uWFFPOVEzWE9iNDQ5clA4aG5vNEgrZWtlK3IxakdueFFkN0pU?=
 =?utf-8?B?Q0R6dlBLMHpVaXUyUXRvVnBnTTdFVWJ6aXVkbW9EbnJVcTVxVDhGcjRySmY3?=
 =?utf-8?B?S2VzZHpDMk8wMVVGZjlEeGF0eE56aDdXWnJwMSt1THc5Tk5ONU5PRkxuUVRs?=
 =?utf-8?B?NkxrTnIxL3RYUG1IVVF4TG92SzlHTVErSU5rUkYybElhYlN0cllIdTQ5bmow?=
 =?utf-8?B?UktLbXV4Nk9wcUVqczlUV1M4VW1lTUJ4Wm9sWmxGRTNXcmI1ZkpDTlVKQmNp?=
 =?utf-8?B?QU1YSm1abGJFZWZ2ZDhqSVpvMjYvU2RFNldsSjVUV2ZUUG9HKzRUUkx5U283?=
 =?utf-8?B?c2NyRERWN1B3N21FaHpkZ01jajJKWkpMNVYxaFpTMGkyNzRORHRrK01JaFdB?=
 =?utf-8?B?amo3cXpOd0xuODVsZVdNRk92TG1zekc1UlI1YWdjejMwWW5xc0tjTWw2aHVi?=
 =?utf-8?B?azAzbTVQSVhibjVrOXFBaTRVS1A5Z2dTWW0rajR4cnZPRkphK28zOWpjbjRp?=
 =?utf-8?B?QjZFZVhmRDRqRFVxNDJ5bWJ3c2xFZDdlSmJONERrR2NqREZzeTUySHBLd2E5?=
 =?utf-8?B?cUIzak5oOEdPK1E1V1NEeWN0eHEwMm1SRTRLNjdrU2tyNm9Yem00U3l6b2NM?=
 =?utf-8?B?Q1FJUUhwSEdkY0plcnl3MnBIUEJ6RDRrR0NUbkk0ZlpzcTlkM2NCY1VWMitV?=
 =?utf-8?B?K1BnSnJmM05BaHIrSmFBdUFvaXNaaFJtbi81OGJ3MVJMV0o4bUsySytvNkU2?=
 =?utf-8?B?d2owWUpnUU9nODhYVUlUamxTZjVnK3lidC9UNURtUnlCbVdZeDByRXRYNFBt?=
 =?utf-8?B?UXN5a1c3V29KTWNUSEVpK1RVVTJrOWFFdklmeVVHYVNrWmw3ODZCdUgrdEtp?=
 =?utf-8?B?RUJZaEhFQy9YbGFvdTBsRURMUjF4cW93YWNtL2VDemJ4QzZSRStMTDlLU1p2?=
 =?utf-8?B?MXc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a2eb0d0-c9ad-4c31-a41e-08dc0dd703dd
X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5365.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 10:13:51.8484
 (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: 9fNj23lPpkWrPKipt7YoRe+OZF7iE7yhp9XDN2EfgsDisDzlGqv3jg5jqm5ClP1xa9Xw1KlH+r0QQkqaSpUDZ27a2vxc9ukB9amoGTA9o+c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4823
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>
---
 drivers/gpu/drm/tests/drm_managed_test.c | 37 +++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
index 986a38c9144a5..c1fc1f0aac9b2 100644
--- a/drivers/gpu/drm/tests/drm_managed_test.c
+++ b/drivers/gpu/drm/tests/drm_managed_test.c
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 
 struct managed_test_priv {
+	struct drm_device *drm;
 	bool action_done;
 };
 
@@ -24,11 +25,26 @@ 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);
+
+	KUNIT_EXPECT_TRUE_MSG(test, priv->action_done, "Release action was not called");
+}
+
+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);
@@ -41,19 +57,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);
-
-	KUNIT_EXPECT_TRUE_MSG(test, priv->action_done, "Release action was not called");
+	return 0;
 }
 
 static struct kunit_case drm_managed_tests[] = {
@@ -63,6 +73,7 @@ static struct kunit_case drm_managed_tests[] = {
 
 static struct kunit_suite drm_managed_test_suite = {
 	.name = "drm_test_managed",
+	.init = drm_managed_test_init,
 	.test_cases = drm_managed_tests
 };
 
-- 
2.43.0