niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/tests: helpers: Switch to kunit actions

Browse source 
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Maíra Canal <mairacanal@riseup.net>
Link: https://lore.kernel.org/r/20230728-kms-kunit-actions-rework-v3-1-952565ccccfe@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
Maxime Ripard 2023-07-28 11:06:14 +02:00
parent 132b6512e6
commit 4f2b0b583b
No known key found for this signature in database
GPG key ID: E3EF0D6F671851C5
1 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/gpu/drm/tests/drm_kunit_helpers.c
View file

@ -26,6 +26,28 @@ static struct platform_driver fake_platform_driver = {
}, },
}; };
static void kunit_action_platform_driver_unregister(void *ptr)
{
struct platform_driver *drv = ptr;
platform_driver_unregister(drv);
}
static void kunit_action_platform_device_put(void *ptr)
{
struct platform_device *pdev = ptr;
platform_device_put(pdev);
}
static void kunit_action_platform_device_del(void *ptr)
{
struct platform_device *pdev = ptr;
platform_device_del(pdev);
}
/** /**
* drm_kunit_helper_alloc_device - Allocate a mock device for a KUnit test * drm_kunit_helper_alloc_device - Allocate a mock device for a KUnit test
* @test: The test context object * @test: The test context object
@ -35,8 +57,8 @@ static struct platform_driver fake_platform_driver = {
* able to leverage the usual infrastructure and most notably the * able to leverage the usual infrastructure and most notably the
* device-managed resources just like a "real" device. * device-managed resources just like a "real" device.
* *
* Callers need to make sure drm_kunit_helper_free_device() on the * Resources will be cleaned up automatically, but the removal can be
* device when done. * forced using @drm_kunit_helper_free_device.
* *
* Returns: * Returns:
* A pointer to the new device, or an ERR_PTR() otherwise. * A pointer to the new device, or an ERR_PTR() otherwise.
@ -49,12 +71,27 @@ struct device *drm_kunit_helper_alloc_device(struct kunit *test)
ret = platform_driver_register(&fake_platform_driver); ret = platform_driver_register(&fake_platform_driver);
KUNIT_ASSERT_EQ(test, ret, 0); 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); pdev = platform_device_alloc(KUNIT_DEVICE_NAME, PLATFORM_DEVID_NONE);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev); 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); ret = platform_device_add(pdev);
KUNIT_ASSERT_EQ(test, ret, 0); 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 &pdev->dev;
} }
EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device); EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device);
@ -70,8 +107,17 @@ void drm_kunit_helper_free_device(struct kunit *test, struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
platform_device_unregister(pdev); kunit_release_action(test,
platform_driver_unregister(&fake_platform_driver); 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,
pdev);
} }
EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device); EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);