[PATCH 3/6] drm/xe/kunit: Drop custom struct platform_test_case
Michal Wajdeczko
michal.wajdeczko at intel.com
Fri Aug 1 18:13:47 UTC 2025
Custom struct platform_test_case definition in xe_wa is now almost
identical to generic struct xe_pci_fake_data defintiion except the
.name member, which could be generated by xe_pci_fake_data_desc().
Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Lucas De Marchi <lucas.demarchi at intel.com>
---
drivers/gpu/drm/xe/tests/xe_wa_test.c | 34 ++++-----------------------
1 file changed, 4 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_wa_test.c b/drivers/gpu/drm/xe/tests/xe_wa_test.c
index a97d42b72d44..391f9597f74c 100644
--- a/drivers/gpu/drm/xe/tests/xe_wa_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_wa_test.c
@@ -15,18 +15,8 @@
#include "xe_tuning.h"
#include "xe_wa.h"
-struct platform_test_case {
- const char *name;
- enum xe_platform platform;
- enum xe_subplatform subplatform;
- u32 graphics_verx100;
- u32 media_verx100;
- struct xe_step_info step;
-};
-
#define PLATFORM_CASE(platform__, graphics_step__) \
{ \
- .name = #platform__ " (" #graphics_step__ ")", \
.platform = XE_ ## platform__, \
.subplatform = XE_SUBPLATFORM_NONE, \
.step = { .graphics = STEP_ ## graphics_step__ } \
@@ -35,7 +25,6 @@ struct platform_test_case {
#define SUBPLATFORM_CASE(platform__, subplatform__, graphics_step__) \
{ \
- .name = #platform__ "_" #subplatform__ " (" #graphics_step__ ")", \
.platform = XE_ ## platform__, \
.subplatform = XE_SUBPLATFORM_ ## platform__ ## _ ## subplatform__, \
.step = { .graphics = STEP_ ## graphics_step__ } \
@@ -44,7 +33,6 @@ struct platform_test_case {
#define GMDID_CASE(platform__, graphics_verx100__, graphics_step__, \
media_verx100__, media_step__) \
{ \
- .name = #platform__ " (g:" #graphics_step__ ", m:" #media_step__ ")",\
.platform = XE_ ## platform__, \
.subplatform = XE_SUBPLATFORM_NONE, \
.graphics_verx100 = graphics_verx100__, \
@@ -53,7 +41,7 @@ struct platform_test_case {
.media = STEP_ ## media_step__ } \
}
-static const struct platform_test_case cases[] = {
+static const struct xe_pci_fake_data cases[] = {
PLATFORM_CASE(TIGERLAKE, B0),
PLATFORM_CASE(DG1, A0),
PLATFORM_CASE(DG1, B0),
@@ -77,26 +65,12 @@ static const struct platform_test_case cases[] = {
GMDID_CASE(BATTLEMAGE, 2001, A0, 1301, A1),
};
-static void platform_desc(const struct platform_test_case *t, char *desc)
-{
- strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE);
-}
-
-KUNIT_ARRAY_PARAM(platform, cases, platform_desc);
+KUNIT_ARRAY_PARAM(platform, cases, xe_pci_fake_data_desc);
static int xe_wa_test_init(struct kunit *test)
{
- const struct platform_test_case *param = test->param_value;
- struct xe_pci_fake_data data = {
- .platform = param->platform,
- .subplatform = param->subplatform,
- .graphics_verx100 = param->graphics_verx100,
- .media_verx100 = param->media_verx100,
- .step = {
- .graphics = param->step.graphics,
- .media = param->step.media,
- },
- };
+ const struct xe_pci_fake_data *param = test->param_value;
+ struct xe_pci_fake_data data = *param;
struct xe_device *xe;
struct device *dev;
int ret;
--
2.47.1
More information about the Intel-xe
mailing list