From: Maxime Ripard <mripard@kernel.org>
To: davidgow@google.com, Rae Moar <rmoar@google.com>,
Brendan Higgins <brendan.higgins@linux.dev>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <mripard@kernel.org>,
dri-devel@lists.freedesktop.org, kunit-dev@googlegroups.com,
linux-kselftest@vger.kernel.org
Subject: [PATCH] drm/tests: Switch to kunit devices
Date: Tue, 5 Dec 2023 10:04:05 +0100 [thread overview]
Message-ID: <20231205090405.153140-1-mripard@kernel.org> (raw)
In-Reply-To: <20231205-kunit_bus-v1-0-635036d3bc13@google.com>
Kunit recently gained helpers to create test managed devices. This means
that we no longer have to roll our own helpers in KMS and we can reuse
them.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
David, feel free to integrate that patch into your series and merge it
whenever and wherever you see fit.
---
drivers/gpu/drm/tests/drm_kunit_helpers.c | 66 ++---------------------
1 file changed, 3 insertions(+), 63 deletions(-)
diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c
index c251e6b34de0..ca4f8e4c5d5d 100644
--- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
@@ -5,6 +5,7 @@
#include <drm/drm_kunit_helpers.h>
#include <drm/drm_managed.h>
+#include <kunit/device.h>
#include <kunit/resource.h>
#include <linux/device.h>
@@ -15,28 +16,6 @@
static const struct drm_mode_config_funcs drm_mode_config_funcs = {
};
-static int fake_probe(struct platform_device *pdev)
-{
- return 0;
-}
-
-static struct platform_driver fake_platform_driver = {
- .probe = fake_probe,
- .driver = {
- .name = KUNIT_DEVICE_NAME,
- },
-};
-
-KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_driver_unregister,
- platform_driver_unregister,
- struct platform_driver *);
-KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_device_put,
- platform_device_put,
- struct platform_device *);
-KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_device_del,
- platform_device_del,
- struct platform_device *);
-
/**
* drm_kunit_helper_alloc_device - Allocate a mock device for a KUnit test
* @test: The test context object
@@ -54,34 +33,7 @@ KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_device_del,
*/
struct device *drm_kunit_helper_alloc_device(struct kunit *test)
{
- struct platform_device *pdev;
- int ret;
-
- ret = platform_driver_register(&fake_platform_driver);
- KUNIT_ASSERT_EQ(test, ret, 0);
-
- ret = kunit_add_action_or_reset(test,
- kunit_action_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_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_platform_device_del,
- pdev);
- KUNIT_ASSERT_EQ(test, ret, 0);
-
- return &pdev->dev;
+ return kunit_device_register(test, KUNIT_DEVICE_NAME);
}
EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device);
@@ -94,19 +46,7 @@ EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device);
*/
void drm_kunit_helper_free_device(struct kunit *test, struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
-
- kunit_release_action(test,
- kunit_action_platform_device_del,
- pdev);
-
- kunit_release_action(test,
- kunit_action_platform_device_put,
- pdev);
-
- kunit_release_action(test,
- kunit_action_platform_driver_unregister,
- &fake_platform_driver);
+ kunit_device_unregister(test, dev);
}
EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);
--
2.43.0
next prev parent reply other threads:[~2023-12-05 9:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 7:31 [PATCH 0/4] kunit: Add helpers for creating test-managed devices davidgow
2023-12-05 7:31 ` [PATCH 1/4] kunit: Add APIs for managing devices davidgow
2023-12-05 8:30 ` Matti Vaittinen
2023-12-06 7:43 ` David Gow
2023-12-05 9:00 ` Maxime Ripard
2023-12-05 9:02 ` Amadeusz Sławiński
2023-12-05 13:53 ` kernel test robot
2023-12-05 14:59 ` kernel test robot
2023-12-05 15:10 ` kernel test robot
2023-12-05 16:05 ` kernel test robot
2023-12-05 17:30 ` Greg Kroah-Hartman
2023-12-06 7:44 ` David Gow
2023-12-07 2:29 ` Greg Kroah-Hartman
2023-12-05 7:31 ` [PATCH 2/4] fortify: test: Use kunit_device davidgow
2023-12-05 8:39 ` Matti Vaittinen
2023-12-06 21:07 ` Kees Cook
2023-12-08 7:38 ` David Gow
2023-12-05 7:31 ` [PATCH 3/4] overflow: Replace fake root_device with kunit_device davidgow
2023-12-05 8:46 ` Matti Vaittinen
2023-12-05 7:31 ` [PATCH 4/4] ASoC: topology: Replace fake root_device with kunit_device in tests davidgow
2023-12-05 9:02 ` Amadeusz Sławiński
2023-12-05 13:03 ` Mark Brown
2023-12-05 9:04 ` Maxime Ripard [this message]
2023-12-06 16:31 ` [PATCH] drm/tests: Switch to kunit devices kernel test robot
2023-12-06 16:42 ` kernel test robot
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=20231205090405.153140-1-mripard@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@linux.ie \
--cc=brendan.higgins@linux.dev \
--cc=daniel.vetter@ffwll.ch \
--cc=davidgow@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=rmoar@google.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).