On Mon, Dec 11, 2023 at 11:09:38PM +0100, Michał Winiarski wrote:
> It simplifies the process of extending the test suite with additional
> test cases without unnecessary duplication.
>
> Signed-off-by: Michał Winiarski <michal.winiarski@xxxxxxxxx>
> ---
> 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");
The addition of the message should be in a separate patch
> +}
> +
> +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
>
Attachment:
signature.asc
Description: PGP signature
