Received-SPF: pass (google.com: domain of linux-kernel+bounces-17722-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 3/6] drm/tests: managed: Remove the waitqueue usage
Date: Fri, 5 Jan 2024 11:13:21 +0100
Message-ID: <20240105101324.26811-4-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?aGdKenJVakF0SEZxNkxPUlpwL012SUZpejNMdDZlT2tuR0ZJNDBNUHhreW1X?=
 =?utf-8?B?d21CRGQ4akhETms5aTJaMGZwb3pOb3hWSUFGemUyaTRBNkVYT1htbmk4a3hx?=
 =?utf-8?B?UVVXMjIwczF6U2JtbkxSelV5MUE0MTdnTy8zTDBldjNYbjNPbDZ0VEhWWkRp?=
 =?utf-8?B?cW5heHlWbk9WRThMTVV1Rm0waFcydDY4aFJrY0w3VE5xRFpLSmR6MDYvb1lP?=
 =?utf-8?B?NWhwb2lzS0FwWEVQM2JweWIxWENTUDN1N0xtN09kWTJSWUVCbDhxSG9qNVJy?=
 =?utf-8?B?WDU0cXJGZmlOZmQyWno4L28vT2s2QkgzdVgzRVRVRlBMSXZvdi9pZHlyNURZ?=
 =?utf-8?B?NjBqRXpRSk94SGtlRi9wRkVmSWM5Mkl2VFpFcjZvUUtRVEE2czc2SWVMWmJB?=
 =?utf-8?B?L1l4UnhMeG9HbkhkRWpNdEN6RUFRdFYwdUx0YjNpVENqVURyY01SUDhDRHFG?=
 =?utf-8?B?WGYvTTRzOTFyRHNHWlVRZklJcjdYUURuRm9iVUQ5SHNLVEhOeGFlczkvUWhl?=
 =?utf-8?B?cHg5OU9PWTBkN1lkNGd6WWFtS25SWldmS21KZ2VFNHJBYXEvZWlUSWJMWjdi?=
 =?utf-8?B?Q21UNGhTSTFENHd2Z2ZqcDMzam1PYjNlNHBKL2FiUTljWDQ2R3I5TEdHdXBW?=
 =?utf-8?B?MGJ2Rjhlb3VPQ3d2ZDZzbWtXVHVNWFdZLzROMXQ5b25rdldrQjFjSVdkMCtQ?=
 =?utf-8?B?RGNTd29hYWMwTXRtSmh1SnU1bmhmazBoY3JVRkR3RkhLV1N1ZVE1M2IzeGZS?=
 =?utf-8?B?NFdubGJzNSt2VVdtVDFZMnU0VzVGVVdZYWJYdGpkMGZ0Y0UrU1I2Tlo4OXZo?=
 =?utf-8?B?RmZad01RS2huNGF6dDk1ODc4b2ZsYmdqSHYxbjZmRGlQQTY1UWt0S2NGQ1NJ?=
 =?utf-8?B?MTZsWVRtb2RsTFAyTFhRTUNXdk5ORTh4bkNzLzFLTk04STdZb2FyazFGL3Jt?=
 =?utf-8?B?TXNLMDNEcUtvRU1tNHA3SmpXSDgvV2pSdXRNNTc2cm94bkZiVzRrTE1oQmQv?=
 =?utf-8?B?bGlxUnIzNDlPWWZDRHdZTHJYVUJyRHRYeStoK043VEhJMTREN0tTSjZhRDk4?=
 =?utf-8?B?TysvSVJMZlVPRitlcUtjZnB1VmdLM1VwY0p4WlVNYmJVT2g1YUFNTHBnY1Ur?=
 =?utf-8?B?Uk1rT1ZrU3NEMktvc1VWUnlNZTAzWHNYSm1ML1JVSHFOQi9kSmFKK0NDTkdK?=
 =?utf-8?B?d2ZVU2QvbWpCd3dzVjVocU9CaVZiOFcwVFZuTEl3aFF4ekpHNEJ1MXM4cjJM?=
 =?utf-8?B?a0VJbldhK2RFTGlreHRsckFuYU45MytyRVptbHFCQkZHVDRYQ1U5c3M0czdq?=
 =?utf-8?B?amdoVEh6QjJHY2hRQlpPRitudTBqWEIydEt6TktCTE12Y2xzWFFlWW4wcHRo?=
 =?utf-8?B?TDZLK2NEb1BsQUpISk5iME03eThlcm1UTmF3bDhGN2pDZ3lCcW1Xa09qMWt4?=
 =?utf-8?B?bkhseWg0NTc1U0VORTlycjRPVzhFeGIyaVBKWGZkdHM4VjkwMjJWd3YzUlpx?=
 =?utf-8?B?UjF6QWNCV241eG1JWkRRRXVYYVo2WG0yZjZZaDlkZ2xIQitMSkdEZ1RpQ093?=
 =?utf-8?B?b0RwbTQ4UUsxQjNaeWI2MzBUOWtVak1sVytyMVdpOU50SmExYUpGeG9keHdh?=
 =?utf-8?B?dVBnR0VXMGZTaE5ad0NLR2FHVkQycGk4WnRyUWpzbndDVkhPb3N1czdOUFhn?=
 =?utf-8?B?SnE1cUFjSTJDYUl2QXVEWE1RaW55akU0bHpHTktGUlB4bnpQYjVqQXZ5TXFy?=
 =?utf-8?B?RWZVbUhYOEZua1haNEcvaWh5NjQ3cGlIZERPTDVGMFhXTkc1MnpIUnROUnRp?=
 =?utf-8?B?QVpaUm9sTTJtZFVzR2VmQlZOcjgzMk9PcnY0MGFZZnROOGxyVVBpUTRhcUMr?=
 =?utf-8?B?ejFwazVCK09yYUxtdFZVNG1zTjdVZjFmbW9VRzNWMk12cHZNN2NRbUVHWmMw?=
 =?utf-8?B?SG9SQkNoS2JpRlI5WUYzcFA2OUhXODR4TElNRTBIajVWN3dTc201SjMzdkdv?=
 =?utf-8?B?T1lnRE1lWFZPcHVnYzJPVWJKc3BkZk1rV054WVl5QVFGOEFFYUdxVnpvTTFH?=
 =?utf-8?B?MmZYU0xwUThGWERsNXlhUlNCbSszaGdLbFprSUwxQ1BGVVB0aGVCU0FiSjVE?=
 =?utf-8?B?K2FrRGlyN1o0bFQxZDV3NnFLZmd5Rk0xVk9QenVMNjNBaVk1dGFZc0J2dGph?=
 =?utf-8?B?THc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 0896ec80-533b-401d-b573-08dc0dd6fecb
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 10:13:43.0143
 (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: ayNhrgxH4BaZUeaSsFXfdJ04DiCoQDiwYbMFuarJXzR3PAvPOCZpCBaT7XDfL20Um9Kaq5uOjS7sKki4ZvWutlKFcBPbAmolujzXiL5/+EM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR11MB8483
X-OriginatorOrg: intel.com

DRM managed release (drm_managed_release) is called as part of devres
release (devres_release_all), which is not async.
The release action should have already been executed once
drm_kunit_helper_free_device exits, meaning that there's no need to use
a waitqueue - we can just inspect the "action_done" state directly.

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

diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
index 659af5abb8014..e4790ae838ba7 100644
--- a/drivers/gpu/drm/tests/drm_managed_test.c
+++ b/drivers/gpu/drm/tests/drm_managed_test.c
@@ -8,12 +8,8 @@
 
 #include <linux/device.h>
 
-/* Ought to be enough for anybody */
-#define TEST_TIMEOUT_MS	100
-
 struct managed_test_priv {
 	bool action_done;
-	wait_queue_head_t action_wq;
 };
 
 static void drm_action(struct drm_device *drm, void *ptr)
@@ -21,7 +17,6 @@ static void drm_action(struct drm_device *drm, void *ptr)
 	struct managed_test_priv *priv = ptr;
 
 	priv->action_done = true;
-	wake_up_interruptible(&priv->action_wq);
 }
 
 static void drm_test_managed_run_action(struct kunit *test)
@@ -33,7 +28,6 @@ static void drm_test_managed_run_action(struct kunit *test)
 
 	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);
@@ -50,9 +44,7 @@ static void drm_test_managed_run_action(struct kunit *test)
 	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);
+	KUNIT_EXPECT_TRUE(test, priv->action_done);
 }
 
 static struct kunit_case drm_managed_tests[] = {
-- 
2.43.0