Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
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 v3 2/3] drm/tests: managed: Extract device initialization into test init
Date:   Mon, 11 Dec 2023 23:09:38 +0100
Message-ID: <20231211220939.215024-3-michal.winiarski@intel.com>
In-Reply-To: <20231211220939.215024-1-michal.winiarski@intel.com>
References: <20231211220939.215024-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?VTlQRTlncmxWL2RqNFBFNUpvWUpaaldUSG9TT0RzTWN6T0tPK2dyek1SV2Y3?=
 =?utf-8?B?Q2F1eGRFcEprZ05rYmVKSUNKcWZEK0kvS2ZJL1dhbTluQ1ZMTEsxUXVvdzJT?=
 =?utf-8?B?TkhraElpTzd1dExBSDNSODMxYnJiODArRG9YSFV6UUhnV0pNTjE2cVZTYzFw?=
 =?utf-8?B?RzJkenB2R1lwMU1OK0RrNlBXVm9kZytJQlU2TXBRREE5cWpkRlU0U0pndnRr?=
 =?utf-8?B?bjk2eDNzWUlRKzJrTlBCUTBmTUJBdEpqeWZKYlpsQzNOTGcyNEZ6Z2xLTXpS?=
 =?utf-8?B?TEFackhIZ3FvaGhNeHN3TnlTTEYvRzNleW04UUp3clkxUDJhL2hnaFcrRFVO?=
 =?utf-8?B?emtoWTdwV2VVdmYwRlNKbTFPN1BiWHI0b2hvekpIQUpOM3NYQVJ3bUh3Qlp1?=
 =?utf-8?B?TjJIWmtON211aGNxdWl1b0RURkdpVnlKUEZUK2RTd255WmlFdGlOWXMvQUtY?=
 =?utf-8?B?ZmJHMEFBSFQ5RWVyTGJCNGwwMDFJQU02eXlSZGZFc3NuMmZSWk5xQ1FtYlRV?=
 =?utf-8?B?Q0RDa3lNdzJKNEp2UWNkakh1S2NPcHNKZDZyU0hBcDFvOVpqMEM4b2EwMXdn?=
 =?utf-8?B?QWNqQVcyekJIV2o3NjcxTWo5dEpDT2dsZTNBV0dEb0o3YnRUSk5sVUhRQkVj?=
 =?utf-8?B?aFBFaDVNN3B2UFJqdndBZ3RlUlBCa2oxUVhZZi9XYmRwTmxiNUlnV0tJMy94?=
 =?utf-8?B?MDNwME5oUHRzczFTVjJpVE1GWlVmelJRTVBtMkhseGtPeXA0dVdxTDVnTTho?=
 =?utf-8?B?ekovWm03ZitUci84MjlGSWh3aCtncUpIZEVMTGt2SlhQSmFnVk5BNm53TTBk?=
 =?utf-8?B?ZkNEbTlVYkEzdENEN0hzaW1HWTJnc0k1bDV1dkU1aG5ka0o2Vy96K3NoT2R6?=
 =?utf-8?B?RkFWUVVCZkg5WTRxa1ZVR3hwMmc3cGhyM2JLSjQ0Q1ZQTVdvdW05UzhodW0z?=
 =?utf-8?B?Q01ubHBIaVlsVXU2ZnpmdjFKNnNxc1owaDhPTnhhZjVFOEN3Umc0VEs4Sm02?=
 =?utf-8?B?em0rd3JYbnJOZks0YzVZb3JmaGFVeUJPdkw0OGpscTVOMlY2ZUNIL2VNd0dz?=
 =?utf-8?B?M3Q1SmNXdGJuL0xEYkdOUTNVc0hqeEE3d2xJTFdrbHkvV0dhODB5TEtSVisy?=
 =?utf-8?B?aHVDNkxaTDJBa21Eci9KMTY3RVpBeVZQbkRJOUtyVGh6VzdGenNrWFJwU3ZJ?=
 =?utf-8?B?VHNoWGR6aE9aUHEwN20yclp1dmRxSW1pWjF0djFuUHRUSnMvcTJ2RTFFMXYr?=
 =?utf-8?B?Sy9Ub1RheWVET0dRSG02RTF6eENkTG1nZ3dtV3NtUUtTcVhpajkwSTNQYWZL?=
 =?utf-8?B?SGN4dlc1N1h3ampudzFDU29mbUdPbS92amZDUnpnckpGQzJReDkzWURSME5w?=
 =?utf-8?B?aFhPNjh5RkRTdDRTY3J0T0prbTJ2RXhFRzQxemhQbWtlYklFRjhCWGI2cnRl?=
 =?utf-8?B?TlNsUTVEV0lLUlQxZHlPWjUwNGt2UkVvTnpKNFMrNzNvYmY4ZDlJakRUbXhu?=
 =?utf-8?B?Q0Vsak1ySjZJNlFrSGpBQkhEMnp1Tnk0b0ZFYjgvdmkxNDdJcmhZa1V3R091?=
 =?utf-8?B?K2ZZRjRHK2RTNGNWMG9TUlp5UG9UYWM1cjNTQk1XRHpFT3VoakthV09BLzJ5?=
 =?utf-8?B?R0hrWTlqd2M4bTJpbmxzZXVkMllWaE83NWxVaGI3V2plVjRCNHhneHBOVzht?=
 =?utf-8?B?em54RjlHcGF2S0RxUTAvZmx3TzE4ekZaR3hYWXVxSUJHcG5wY0h5U3Q4eWlO?=
 =?utf-8?B?MStwc3VDNThYdnhsZTJXNGdDNjBybmdTd3hwZ3AvNlhmUVk2elR4ZjExbUpL?=
 =?utf-8?B?L3JUNnVEMkVtd2NFNkxQQ245MEFQVTgybUtLM0duSXIySTVHUTFrYnJSQVZ4?=
 =?utf-8?B?cjFaekgvais1QjNOK3AxQnNwN1d1T1l6YmlRQWFRKzJ4S21tbDkxc3cwS3pW?=
 =?utf-8?B?WDg1RkJETUxkbzJ5ZDkvbGkzU3J3eTJsOTduSWNHbHgyamkzck9NbXQwRUl0?=
 =?utf-8?B?U3lkQWFnQ2tDMTVpMWsvY0NsemZHNnhUMHBEcmRiS1FDM1Q3L0p4aHBuSWc1?=
 =?utf-8?B?azVoTC9Tc0ZlZnBGZEp3NEw0ZVptcEJTSE13VjZXdjQ4bjF0WVVWUDRwN3VM?=
 =?utf-8?B?bDBSQlZqNWNoc1A0QkcwWlA3VlMwTXpzNkI5T3UrbzZZVnBWNnZVU1RnUVJ4?=
 =?utf-8?B?cEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e981944c-6e56-45c4-ff60-08dbfa95e6ad
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:09:53.1685
 (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: mz27213IHC/FUoaZn7qkFuf1FvZNassZft3qMa/OMmnfuz9I2GU29Zi5BkjFHK1wMzU5JepUjbSI4NOVIgL1uGf64P/2H0voVWqu1r62giE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8134
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
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 (snail.vger.email [0.0.0.0]); Mon, 11 Dec 2023 14:10:16 -0800 (PST)

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 | 51 +++++++++++++++++-------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
index 1652dca11d30c..15bd2474440b5 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;
 };
@@ -24,35 +25,54 @@ static void drm_action(struct drm_device *drm, void *ptr)
 	wake_up_interruptible(&priv->action_wq);
 }
 
+/*
+ * The test verifies that the release action is called automatically when the
+ * 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_MSG(test, ret, 0, "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);
-	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);
+	/*
+	 * DRM device can't be embedded in priv, since priv->action_done needs
+	 * to remain allocated beyond both parent device and drm_device
+	 * lifetime.
+	 */
+	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);
-
-	ret = drm_dev_register(drm, 0);
-	KUNIT_ASSERT_EQ(test, ret, 0);
+	init_waitqueue_head(&priv->action_wq);
 
-	drm_dev_unregister(drm);
-	drm_kunit_helper_free_device(test, dev);
+	test->priv = priv;
 
-	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[] = {
@@ -62,6 +82,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