Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
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 v2 2/3] drm/tests: managed: Extract device initialization into test init
Date:   Tue, 5 Dec 2023 02:22:09 +0100
Message-ID: <20231205012210.1491532-3-michal.winiarski@intel.com>
In-Reply-To: <20231205012210.1491532-1-michal.winiarski@intel.com>
References: <20231205012210.1491532-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WUIzMFZGaWYvVVBFQmV2ckU0S3RpZnpONmRucWkrcTNTeXI2dlBLc2d6SDN2?=
 =?utf-8?B?cU85NTVhazdpcGFQTkpOL1o3UTRPZjRuYUg4ZzJrNGt5UUo2Z0ExSUh6WVVO?=
 =?utf-8?B?bXZZVlRHNDBjNkExbGZnNFlhb1YxVjVwUjNRQUFheUZKTE95d0FCOExPS3VW?=
 =?utf-8?B?M3MxNDU4cnJqakJYV2twSk5nSk1FVUhySmdkQ1EzNEgyMXUwZldYQjlwMUdK?=
 =?utf-8?B?eWkzYUkranR6cUJpYXYwR2xnNnZhNVFqaDNDWVY4U2xIMVpTejJzY2NUZEtq?=
 =?utf-8?B?S0JNbXNmT1Y4Y0QvR0ZSUFNkVmdJT0d4WjZOUDlTaGs3QzZHYm5UNXNpSHA3?=
 =?utf-8?B?TldoNGFqOFo1YjhnTlpJQnB3c0o2RTNDQWVzSHVHV01UZWN6eGNINmYxdm1x?=
 =?utf-8?B?NGR4TStmRHdSMlFHeUtLSk9OQUFlWi9NZ2pGckhVSWM2TU4rdUNwcUlEMDVH?=
 =?utf-8?B?bFgxT3UwcDZ3d1NranhUMGtwWER5RzZrbDJzNER3L0VmSStEN29BZFplaG5W?=
 =?utf-8?B?aDdNY3MwcW8xcjQwUmF6dWZhSnJ3QjhCcFNhenF4Z25IMlRDeldodmdPRzlO?=
 =?utf-8?B?WEpBVWJ4a2NxcDZUQy9NMlBKM0pRY2ZHQmkvTFNIKzMwR1dOZ2dZQ1lKWUhI?=
 =?utf-8?B?Nk1UTHJzNGFPNWlhamdwdGFCdDVJVEF2RWxObHM0THRkS1B0dGFoSkcybUxk?=
 =?utf-8?B?NFhsSWpORU43dUlza1JCeER3TU82Z1lDYkdQL2svTktDdG9ZL1ZPelJoYXp0?=
 =?utf-8?B?TWdacU9iOHlDT1FXc2xPaGJHbWxiNzFJR0pYVldCaWVwSDNNeHlWKzk4M29v?=
 =?utf-8?B?RWNNSjhYOG1COEttN1grZWlHZCtpK1pIUldjZ3VpVitoTWlvNjY2bTFHZ0Y1?=
 =?utf-8?B?YlZ4UC8xZksya1FCdFZYMVU1VjNtUEV6YTJmNlJmYmlwMW9qdHZZQ0dyeVBu?=
 =?utf-8?B?M0E0bjJERzBITzlLOWQvZUpnR2Z2ejIxVmcwOUVyRDZneDBiRWlBV1diQzhh?=
 =?utf-8?B?VDczWWFNWUJSQ2RkWEsvMzBrejdYWEJrdHFwQVpkRS9rOHZ4SWhtcXRNRlRB?=
 =?utf-8?B?aHJKcVlqODU0ZTZ3WGd2c3VlRkgrWUVWQzhyU0xPZU1nWkVDWWdzVkwvM0J1?=
 =?utf-8?B?dHlpd1lkY3ZpbStMYW1neGw0MyswQjVCZDAzTGdQZHBPTEs2UHNhSzR3ckFH?=
 =?utf-8?B?SXNUVEI3T3NNdEh0cStYZXZWcVVtRktFZzIrUldDdkNRZmRPUkNjTXBnR3JM?=
 =?utf-8?B?dGpiZ0ZucE9TVE92bnJMazZkOWp3S3FCMkt4WVEzZmYzd0FFRlRnODRRaHF4?=
 =?utf-8?B?QUJpRm13T3dMdjRNTE9YYmU4cmxBNTUxTGltbVZ2WlVOZWJYMWl3VXNhNjNy?=
 =?utf-8?B?elhEb3haT1BkbEErYUV3UnkwMXBQa3gxNm5WdXpCdVBnUHV0QkFCQU9HZ0Ju?=
 =?utf-8?B?Z3F6ellHc0N4L0dhNkdneC9XaWFoR1QwYkhpVFBhc254WlY0Y1NYU2RuSEpB?=
 =?utf-8?B?dzhEbWFTekxLUnNOaUFIUDdBU1lXRXpubXVoMllNdHRLcmtaQlpTemxOSjFq?=
 =?utf-8?B?MG1tbEZXZjVWZnV2Tk94bmRVc24xdm9XT3hjQ3hEcmhoaXBiay9MKzkyWC8x?=
 =?utf-8?B?VHcxV3hKS3FlNW1vdlRtUFFzVzl3aGwxNDh2VzBnVDBKR3RGMDk1OGNCeDRU?=
 =?utf-8?B?ZER0djBqbW9JaEFyNjdYWUxkRUk2V2k1N2N0eVRrVGVzVTZPS2lEbTZLai85?=
 =?utf-8?B?RGNSRW5qaTNsRnNiR0I2ekxkVkFNOUc1R1VtZUdjVXYrL0s0WlBvMlRjK09D?=
 =?utf-8?B?cFMveExTMWZxNWRMNHdsamNuU05FRU1BRUdMd3FFSmcwU21HRzlFV3pPSTlS?=
 =?utf-8?B?VG1vQlIxM1pJKzZ6NDAraWFRNGZFS1k2Wks4a3AwcjBUOVN5K0JNS1V5MXhL?=
 =?utf-8?B?UlBkR0hQQUpuSHJOOXhzQWY2UW9QTmJINWFGMDdzUGgvb1NiUmpSZ3NQV1Qx?=
 =?utf-8?B?bmtOYXNmVHN4Wmp2QldEcWNPaDNWMlJ0UHNsQTdvbUJONFFuMkdpKzc3NnVN?=
 =?utf-8?B?elFtT3cvV2VCcm5FTkljWXZZeGpMRjI4N3BLaksxZGh3Zjk4U2d6NFFPdGhQ?=
 =?utf-8?B?Zkp1S3JIelhidjYxMzIvcjF2M0tUc2NTSDBJQ0RhZjNoSERxdmthYURDYWlY?=
 =?utf-8?B?eEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4de0bfa0-4a5e-4d13-a688-08dbf530af88
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2023 01:22:45.6560
 (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: gH16Y5fcsXL3NE3EBKP1Qdb//yY6cjYY+I84G9XYlD6YcB6QAeaa5dq68K1VOfpqjYA+OfubnG6GO0ib0pFMKo0NvngrCM+IU/WR/7EO+ro=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7618
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 04 Dec 2023 17:23:01 -0800 (PST)

It simplifies the process of extending the test suite with additional
test cases without unnecessary duplication.
Additionally, store drm_device inside priv to simplify the lifetime
management by tying priv lifetime with parent struct device.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 drivers/gpu/drm/tests/drm_managed_test.c | 43 ++++++++++++++----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
index 1652dca11d30c..cabe6360aef71 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;
 };
@@ -26,35 +27,42 @@ static void drm_action(struct drm_device *drm, void *ptr)
 
 static void drm_test_managed_run_action(struct kunit *test)
 {
-	struct managed_test_priv *priv;
-	struct drm_device *drm;
-	struct device *dev;
+	struct managed_test_priv *priv = test->priv;
 	int ret;
 
-	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);
-	init_waitqueue_head(&priv->action_wq);
-
-	dev = drm_kunit_helper_alloc_device(test);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
-
-	drm = __drm_kunit_helper_alloc_drm_device(test, dev, sizeof(*drm), 0, DRIVER_MODESET);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, drm);
-
-	ret = drmm_add_action_or_reset(drm, drm_action, priv);
+	ret = drmm_add_action_or_reset(&priv->drm, drm_action, priv);
 	KUNIT_EXPECT_EQ(test, ret, 0);
 
-	ret = drm_dev_register(drm, 0);
+	ret = drm_dev_register(&priv->drm, 0);
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
-	drm_dev_unregister(drm);
-	drm_kunit_helper_free_device(test, dev);
+	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 device *dev;
+
+	dev = drm_kunit_helper_alloc_device(test);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
+
+	priv = drm_kunit_helper_alloc_drm_device(test, dev, struct managed_test_priv, drm,
+						 DRIVER_MODESET);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);
+
+	init_waitqueue_head(&priv->action_wq);
+
+	test->priv = priv;
+
+	return 0;
+}
+
 static struct kunit_case drm_managed_tests[] = {
 	KUNIT_CASE(drm_test_managed_run_action),
 	{}
@@ -62,6 +70,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