From: Maxime Ripard <mripard@kernel.org> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, Emma Anholt <emma@anholt.net> Cc: "Maíra Canal" <mairacanal@riseup.net>, "Javier Martinez Canillas" <javierm@redhat.com>, dri-devel@lists.freedesktop.org, "David Gow" <davidgow@google.com>, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, "Maxime Ripard" <mripard@kernel.org>, "Brendan Higgins" <brendan.higgins@linux.dev> Subject: [PATCH v2 01/11] drm/tests: helpers: Switch to kunit actions Date: Thu, 20 Jul 2023 13:15:46 +0200 [thread overview] Message-ID: <20230720-kms-kunit-actions-rework-v2-1-175017bd56ab@kernel.org> (raw) In-Reply-To: <20230720-kms-kunit-actions-rework-v2-0-175017bd56ab@kernel.org> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Maxime Ripard <mripard@kernel.org> --- drivers/gpu/drm/tests/drm_kunit_helpers.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c index 4df47071dc88..5856beb7f7d7 100644 --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c @@ -35,8 +35,8 @@ static struct platform_driver fake_platform_driver = { * able to leverage the usual infrastructure and most notably the * device-managed resources just like a "real" device. * - * Callers need to make sure drm_kunit_helper_free_device() on the - * device when done. + * Resources will be cleaned up automatically, but the removal can be + * forced using @drm_kunit_helper_free_device. * * Returns: * A pointer to the new device, or an ERR_PTR() otherwise. @@ -49,12 +49,27 @@ struct device *drm_kunit_helper_alloc_device(struct kunit *test) ret = platform_driver_register(&fake_platform_driver); KUNIT_ASSERT_EQ(test, ret, 0); + ret = kunit_add_action_or_reset(test, + (kunit_action_t *)platform_driver_unregister, + &fake_platform_driver); + KUNIT_ASSERT_EQ(test, ret, 0); + pdev = platform_device_alloc(KUNIT_DEVICE_NAME, PLATFORM_DEVID_NONE); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev); + ret = kunit_add_action_or_reset(test, + (kunit_action_t *)platform_device_put, + pdev); + KUNIT_ASSERT_EQ(test, ret, 0); + ret = platform_device_add(pdev); KUNIT_ASSERT_EQ(test, ret, 0); + ret = kunit_add_action_or_reset(test, + (kunit_action_t *)platform_device_del, + pdev); + KUNIT_ASSERT_EQ(test, ret, 0); + return &pdev->dev; } EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device); @@ -70,8 +85,13 @@ void drm_kunit_helper_free_device(struct kunit *test, struct device *dev) { struct platform_device *pdev = to_platform_device(dev); - platform_device_unregister(pdev); - platform_driver_unregister(&fake_platform_driver); + kunit_release_action(test, + (kunit_action_t *)platform_device_unregister, + pdev); + + kunit_release_action(test, + (kunit_action_t *)platform_driver_unregister, + &fake_platform_driver); } EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device); -- 2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Maxime Ripard <mripard@kernel.org> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, Emma Anholt <emma@anholt.net> Cc: linux-kselftest@vger.kernel.org, "Brendan Higgins" <brendan.higgins@linux.dev>, "Javier Martinez Canillas" <javierm@redhat.com>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Maíra Canal" <mairacanal@riseup.net>, "Maxime Ripard" <mripard@kernel.org>, "David Gow" <davidgow@google.com>, kunit-dev@googlegroups.com Subject: [PATCH v2 01/11] drm/tests: helpers: Switch to kunit actions Date: Thu, 20 Jul 2023 13:15:46 +0200 [thread overview] Message-ID: <20230720-kms-kunit-actions-rework-v2-1-175017bd56ab@kernel.org> (raw) In-Reply-To: <20230720-kms-kunit-actions-rework-v2-0-175017bd56ab@kernel.org> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Maxime Ripard <mripard@kernel.org> --- drivers/gpu/drm/tests/drm_kunit_helpers.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c index 4df47071dc88..5856beb7f7d7 100644 --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c @@ -35,8 +35,8 @@ static struct platform_driver fake_platform_driver = { * able to leverage the usual infrastructure and most notably the * device-managed resources just like a "real" device. * - * Callers need to make sure drm_kunit_helper_free_device() on the - * device when done. + * Resources will be cleaned up automatically, but the removal can be + * forced using @drm_kunit_helper_free_device. * * Returns: * A pointer to the new device, or an ERR_PTR() otherwise. @@ -49,12 +49,27 @@ struct device *drm_kunit_helper_alloc_device(struct kunit *test) ret = platform_driver_register(&fake_platform_driver); KUNIT_ASSERT_EQ(test, ret, 0); + ret = kunit_add_action_or_reset(test, + (kunit_action_t *)platform_driver_unregister, + &fake_platform_driver); + KUNIT_ASSERT_EQ(test, ret, 0); + pdev = platform_device_alloc(KUNIT_DEVICE_NAME, PLATFORM_DEVID_NONE); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev); + ret = kunit_add_action_or_reset(test, + (kunit_action_t *)platform_device_put, + pdev); + KUNIT_ASSERT_EQ(test, ret, 0); + ret = platform_device_add(pdev); KUNIT_ASSERT_EQ(test, ret, 0); + ret = kunit_add_action_or_reset(test, + (kunit_action_t *)platform_device_del, + pdev); + KUNIT_ASSERT_EQ(test, ret, 0); + return &pdev->dev; } EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device); @@ -70,8 +85,13 @@ void drm_kunit_helper_free_device(struct kunit *test, struct device *dev) { struct platform_device *pdev = to_platform_device(dev); - platform_device_unregister(pdev); - platform_driver_unregister(&fake_platform_driver); + kunit_release_action(test, + (kunit_action_t *)platform_device_unregister, + pdev); + + kunit_release_action(test, + (kunit_action_t *)platform_driver_unregister, + &fake_platform_driver); } EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device); -- 2.41.0
next prev parent reply other threads:[~2023-07-20 11:16 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-20 11:15 [PATCH v2 00/11] drm: kunit: Switch to kunit actions Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard [this message] 2023-07-20 11:15 ` [PATCH v2 01/11] drm/tests: helpers: " Maxime Ripard 2023-07-20 17:14 ` kernel test robot 2023-07-20 17:14 ` kernel test robot 2023-07-24 11:19 ` Maxime Ripard 2023-07-24 11:19 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 02/11] drm/tests: client-modeset: Remove call to drm_kunit_helper_free_device() Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 03/11] drm/tests: modes: " Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 04/11] drm/tests: probe-helper: " Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 05/11] drm/tests: helpers: Create a helper to allocate a locking ctx Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 14:37 ` kernel test robot 2023-07-20 14:37 ` kernel test robot 2023-07-20 11:15 ` [PATCH v2 06/11] drm/tests: helpers: Create a helper to allocate an atomic state Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 18:06 ` kernel test robot 2023-07-20 18:06 ` kernel test robot 2023-07-20 11:15 ` [PATCH v2 07/11] drm/vc4: tests: pv-muxing: Remove call to drm_kunit_helper_free_device() Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 08/11] drm/vc4: tests: mock: Use a kunit action to unregister DRM device Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 09/11] drm/vc4: tests: pv-muxing: Switch to managed locking init Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 10/11] drm/vc4: tests: Switch to atomic state allocation helper Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-20 11:15 ` [PATCH v2 11/11] drm/vc4: tests: pv-muxing: Document test scenario Maxime Ripard 2023-07-20 11:15 ` Maxime Ripard 2023-07-23 14:22 ` [PATCH v2 00/11] drm: kunit: Switch to kunit actions Maira Canal 2023-07-23 14:22 ` Maira Canal 2023-07-31 12:23 ` Maxime Ripard 2023-07-31 12:23 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230720-kms-kunit-actions-rework-v2-1-175017bd56ab@kernel.org \ --to=mripard@kernel.org \ --cc=airlied@gmail.com \ --cc=brendan.higgins@linux.dev \ --cc=daniel@ffwll.ch \ --cc=davidgow@google.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=emma@anholt.net \ --cc=javierm@redhat.com \ --cc=kunit-dev@googlegroups.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=mairacanal@riseup.net \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.