[PATCH 2/6] drm: add drm_exec selftests v4
Maira Canal
mcanal at igalia.com
Wed Jul 12 00:59:23 UTC 2023
On 7/11/23 10:31, Christian König wrote:
> Exercise at least all driver facing functions of this new component.
>
> v2: add array test as well
> v3: some kunit cleanups
> v4: more tests and cleanups
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/Kconfig | 1 +
> drivers/gpu/drm/tests/Makefile | 3 +-
> drivers/gpu/drm/tests/drm_exec_test.c | 159 ++++++++++++++++++++++++++
> 3 files changed, 162 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/drm/tests/drm_exec_test.c
>
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index c0b4063a3ee6..22c1ba9ea28c 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -80,6 +80,7 @@ config DRM_KUNIT_TEST
> select DRM_BUDDY
> select DRM_EXPORT_FOR_TESTS if m
> select DRM_KUNIT_TEST_HELPERS
> + select DRM_EXEC
> default KUNIT_ALL_TESTS
> help
> This builds unit tests for DRM. This option is not useful for
> diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile
> index bca726a8f483..ba7baa622675 100644
> --- a/drivers/gpu/drm/tests/Makefile
> +++ b/drivers/gpu/drm/tests/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \
> drm_modes_test.o \
> drm_plane_helper_test.o \
> drm_probe_helper_test.o \
> - drm_rect_test.o
> + drm_rect_test.o \
> + drm_exec_test.o
>
> CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN)
> diff --git a/drivers/gpu/drm/tests/drm_exec_test.c b/drivers/gpu/drm/tests/drm_exec_test.c
> new file mode 100644
> index 000000000000..727ac267682e
> --- /dev/null
> +++ b/drivers/gpu/drm/tests/drm_exec_test.c
> @@ -0,0 +1,159 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright 2022 Advanced Micro Devices, Inc.
> + */
> +
> +#define pr_fmt(fmt) "drm_exec: " fmt
Do we need this pr_fmt(fmt)?
Best Regards,
- Maíra
> +
> +#include <kunit/test.h>
> +
> +#include <linux/module.h>
> +#include <linux/prime_numbers.h>
> +
> +#include <drm/drm_exec.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_gem.h>
> +
> +#include "../lib/drm_random.h"
> +
> +static struct drm_device dev;
> +
> +static void sanitycheck(struct kunit *test)
> +{
> + struct drm_exec exec;
> +
> + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
> + drm_exec_fini(&exec);
> + KUNIT_SUCCEED(test);
> +}
> +
> +static void test_lock(struct kunit *test)
> +{
> + struct drm_gem_object gobj = { };
> + struct drm_exec exec;
> + int ret;
> +
> + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE);
> +
> + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
> + drm_exec_until_all_locked(&exec) {
> + ret = drm_exec_lock_obj(&exec, &gobj);
> + drm_exec_retry_on_contention(&exec);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + if (ret)
> + break;
> + }
> + drm_exec_fini(&exec);
> +}
> +
> +static void test_lock_unlock(struct kunit *test)
> +{
> + struct drm_gem_object gobj = { };
> + struct drm_exec exec;
> + int ret;
> +
> + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE);
> +
> + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
> + drm_exec_until_all_locked(&exec) {
> + ret = drm_exec_lock_obj(&exec, &gobj);
> + drm_exec_retry_on_contention(&exec);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + if (ret)
> + break;
> +
> + drm_exec_unlock_obj(&exec, &gobj);
> + ret = drm_exec_lock_obj(&exec, &gobj);
> + drm_exec_retry_on_contention(&exec);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + if (ret)
> + break;
> + }
> + drm_exec_fini(&exec);
> +}
> +
> +static void test_duplicates(struct kunit *test)
> +{
> + struct drm_gem_object gobj = { };
> + struct drm_exec exec;
> + int ret;
> +
> + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE);
> +
> + drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES);
> + drm_exec_until_all_locked(&exec) {
> + ret = drm_exec_lock_obj(&exec, &gobj);
> + drm_exec_retry_on_contention(&exec);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + if (ret)
> + break;
> +
> + ret = drm_exec_lock_obj(&exec, &gobj);
> + drm_exec_retry_on_contention(&exec);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + if (ret)
> + break;
> + }
> + drm_exec_unlock_obj(&exec, &gobj);
> + drm_exec_fini(&exec);
> +}
> +
> +
> +
> +static void test_prepare(struct kunit *test)
> +{
> + struct drm_gem_object gobj = { };
> + struct drm_exec exec;
> + int ret;
> +
> + drm_gem_private_object_init(&dev, &gobj, PAGE_SIZE);
> +
> + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
> + drm_exec_until_all_locked(&exec) {
> + ret = drm_exec_prepare_obj(&exec, &gobj, 1);
> + drm_exec_retry_on_contention(&exec);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + if (ret)
> + break;
> + }
> + drm_exec_fini(&exec);
> +}
> +
> +static void test_prepare_array(struct kunit *test)
> +{
> + struct drm_gem_object gobj1 = { };
> + struct drm_gem_object gobj2 = { };
> + struct drm_gem_object *array[] = { &gobj1, &gobj2 };
> + struct drm_exec exec;
> + int ret;
> +
> + drm_gem_private_object_init(&dev, &gobj1, PAGE_SIZE);
> + drm_gem_private_object_init(&dev, &gobj2, PAGE_SIZE);
> +
> + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
> + drm_exec_until_all_locked(&exec)
> + ret = drm_exec_prepare_array(&exec, array, ARRAY_SIZE(array),
> + 1);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> + drm_exec_fini(&exec);
> +}
> +
> +static struct kunit_case drm_exec_tests[] = {
> + KUNIT_CASE(sanitycheck),
> + KUNIT_CASE(test_lock),
> + KUNIT_CASE(test_lock_unlock),
> + KUNIT_CASE(test_duplicates),
> + KUNIT_CASE(test_prepare),
> + KUNIT_CASE(test_prepare_array),
> + {}
> +};
> +
> +static struct kunit_suite drm_exec_test_suite = {
> + .name = "drm_exec",
> + .test_cases = drm_exec_tests,
> +};
> +
> +kunit_test_suite(drm_exec_test_suite);
> +
> +MODULE_AUTHOR("AMD");
> +MODULE_LICENSE("GPL and additional rights");
More information about the dri-devel
mailing list