mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 11:55:37 +00:00
drm: selftest: convert drm_mm selftest to KUnit
Considering the current adoption of the KUnit framework, convert the DRM mm selftest to the KUnit API. Signed-off-by: Arthur Grillo <arthur.grillo@usp.br> Tested-by: David Gow <davidgow@google.com> Acked-by: Daniel Latypov <dlatypov@google.com> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Maíra Canal <maira.canal@usp.br> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220708203052.236290-10-maira.canal@usp.br
This commit is contained in:
Arthur Grillo
Javier Martinez Canillas
parent
932da86195
commit
fc8d29e298
9 changed files with 509 additions and 953 deletions
|
|
@ -617,17 +617,6 @@ Contact: Javier Martinez Canillas <javierm@redhat.com>
|
|||
|
||||
Level: Intermediate
|
||||
|
||||
Convert Kernel Selftests (kselftest) to KUnit tests when appropriate
|
||||
--------------------------------------------------------------------
|
||||
|
||||
Many of the `Kselftest <https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html>`_
|
||||
tests in DRM could be converted to Kunit tests instead, since that framework
|
||||
is more suitable for unit testing.
|
||||
|
||||
Contact: Javier Martinez Canillas <javierm@redhat.com>
|
||||
|
||||
Level: Starter
|
||||
|
||||
Enable trinity for DRM
|
||||
----------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -50,26 +50,6 @@ config DRM_DEBUG_MM
|
|||
|
||||
If in doubt, say "N".
|
||||
|
||||
config DRM_DEBUG_SELFTEST
|
||||
tristate "kselftests for DRM"
|
||||
depends on DRM
|
||||
depends on DEBUG_KERNEL
|
||||
select PRIME_NUMBERS
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HELPER
|
||||
select DRM_LIB_RANDOM
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_BUDDY
|
||||
select DRM_EXPORT_FOR_TESTS if m
|
||||
default n
|
||||
help
|
||||
This option provides kernel modules that can be used to run
|
||||
various selftests on parts of the DRM api. This option is not
|
||||
useful for distributions or general kernels, but only for kernel
|
||||
developers working on DRM and associated drivers.
|
||||
|
||||
If in doubt, say "N".
|
||||
|
||||
config DRM_KUNIT_TEST
|
||||
tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
|
||||
depends on DRM && KUNIT
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@ obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
|
|||
# Drivers and the rest
|
||||
#
|
||||
|
||||
obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
|
||||
obj-$(CONFIG_DRM_KUNIT_TEST) += tests/
|
||||
|
||||
obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* List each unit test as selftest(name, function)
|
||||
*
|
||||
* The name is used as both an enum and expanded as igt__name to create
|
||||
* a module parameter. It must be unique and legal for a C identifier.
|
||||
*
|
||||
* Tests are executed in order by igt/drm_mm
|
||||
*/
|
||||
selftest(sanitycheck, igt_sanitycheck) /* keep first (selfcheck for igt) */
|
||||
selftest(init, igt_init)
|
||||
selftest(debug, igt_debug)
|
||||
selftest(reserve, igt_reserve)
|
||||
selftest(insert, igt_insert)
|
||||
selftest(replace, igt_replace)
|
||||
selftest(insert_range, igt_insert_range)
|
||||
selftest(align, igt_align)
|
||||
selftest(frag, igt_frag)
|
||||
selftest(align32, igt_align32)
|
||||
selftest(align64, igt_align64)
|
||||
selftest(evict, igt_evict)
|
||||
selftest(evict_range, igt_evict_range)
|
||||
selftest(bottomup, igt_bottomup)
|
||||
selftest(lowest, igt_lowest)
|
||||
selftest(topdown, igt_topdown)
|
||||
selftest(highest, igt_highest)
|
||||
selftest(color, igt_color)
|
||||
selftest(color_evict, igt_color_evict)
|
||||
selftest(color_evict_range, igt_color_evict_range)
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
/*
|
||||
* Copyright © 2016 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#define selftest(name, func) __idx_##name,
|
||||
enum {
|
||||
#include TESTS
|
||||
};
|
||||
#undef selftest
|
||||
|
||||
#define selftest(n, f) [__idx_##n] = { .name = #n, .func = f },
|
||||
static struct drm_selftest {
|
||||
bool enabled;
|
||||
const char *name;
|
||||
int (*func)(void *);
|
||||
} selftests[] = {
|
||||
#include TESTS
|
||||
};
|
||||
#undef selftest
|
||||
|
||||
/* Embed the line number into the parameter name so that we can order tests */
|
||||
#define param(n) __PASTE(igt__, __PASTE(__PASTE(__LINE__, __), n))
|
||||
#define selftest_0(n, func, id) \
|
||||
module_param_named(id, selftests[__idx_##n].enabled, bool, 0400);
|
||||
#define selftest(n, func) selftest_0(n, func, param(n))
|
||||
#include TESTS
|
||||
#undef selftest
|
||||
|
||||
static void set_default_test_all(struct drm_selftest *st, unsigned long count)
|
||||
{
|
||||
unsigned long i;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
if (st[i].enabled)
|
||||
return;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
st[i].enabled = true;
|
||||
}
|
||||
|
||||
static int run_selftests(struct drm_selftest *st,
|
||||
unsigned long count,
|
||||
void *data)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
set_default_test_all(st, count);
|
||||
|
||||
/* Tests are listed in natural order in drm_*_selftests.h */
|
||||
for (; count--; st++) {
|
||||
if (!st->enabled)
|
||||
continue;
|
||||
|
||||
pr_debug("drm: Running %s\n", st->name);
|
||||
err = st->func(data);
|
||||
if (err)
|
||||
break;
|
||||
}
|
||||
|
||||
if (WARN(err > 0 || err == -ENOTTY,
|
||||
"%s returned %d, conflicting with selftest's magic values!\n",
|
||||
st->name, err))
|
||||
err = -1;
|
||||
|
||||
rcu_barrier();
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __maybe_unused
|
||||
__drm_subtests(const char *caller,
|
||||
const struct drm_subtest *st,
|
||||
int count,
|
||||
void *data)
|
||||
{
|
||||
int err;
|
||||
|
||||
for (; count--; st++) {
|
||||
pr_debug("Running %s/%s\n", caller, st->name);
|
||||
err = st->func(data);
|
||||
if (err) {
|
||||
pr_err("%s: %s failed with error %d\n",
|
||||
caller, st->name, err);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* Copyright © 2016 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef __DRM_SELFTEST_H__
|
||||
#define __DRM_SELFTEST_H__
|
||||
|
||||
struct drm_subtest {
|
||||
int (*func)(void *data);
|
||||
const char *name;
|
||||
};
|
||||
|
||||
static int __drm_subtests(const char *caller,
|
||||
const struct drm_subtest *st,
|
||||
int count,
|
||||
void *data);
|
||||
#define drm_subtests(T, data) \
|
||||
__drm_subtests(__func__, T, ARRAY_SIZE(T), data)
|
||||
|
||||
#define SUBTEST(x) { x, #x }
|
||||
|
||||
#endif /* __DRM_SELFTEST_H__ */
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
obj-$(CONFIG_DRM_KUNIT_TEST) += drm_format_helper_test.o drm_damage_helper_test.o \
|
||||
drm_cmdline_parser_test.o drm_rect_test.o drm_format_test.o drm_plane_helper_test.o \
|
||||
drm_dp_mst_helper_test.o drm_framebuffer_test.o drm_buddy_test.o
|
||||
drm_dp_mst_helper_test.o drm_framebuffer_test.o drm_buddy_test.o drm_mm_test.o
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue