From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Shuah Khan" <skhan@linuxfoundation•org>,
"Lucas De Marchi" <lucas.demarchi@intel•com>,
"Thomas Hellström" <thomas.hellstrom@linux•intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel•com>,
David Gow <davidgow@google•com>,
Marie Zhussupova <marievic@google•com>,
DRM XE List <intel-xe@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the kunit-next tree with the drm-xe tree
Date: Mon, 8 Sep 2025 17:29:38 +1000 [thread overview]
Message-ID: <20250908172938.68a86c52@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 4401 bytes --]
Hi all,
After merging the kunit-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/xe/xe_pci.c:1104:
drivers/gpu/drm/xe/tests/xe_pci.c: In function 'xe_pci_fake_data_gen_params':
drivers/gpu/drm/xe/tests/xe_pci.c:80:36: error: passing argument 1 of 'platform_gen_params' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
80 | return platform_gen_params(prev, desc);
| ^~~~
In file included from include/kunit/static_stub.h:18,
from drivers/gpu/drm/xe/xe_pci.c:8:
include/kunit/test.h:1729:60: note: expected 'struct kunit *' but argument is of type 'const void *'
1729 | static const void *name##_gen_params(struct kunit *test, \
| ~~~~~~~~~~~~~~^~~~
drivers/gpu/drm/xe/tests/xe_pci.c:65:1: note: in expansion of macro 'KUNIT_ARRAY_PARAM'
65 | KUNIT_ARRAY_PARAM(platform, cases, xe_pci_fake_data_desc);
| ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/xe/tests/xe_pci.c:80:16: error: too few arguments to function 'platform_gen_params'
80 | return platform_gen_params(prev, desc);
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/xe/tests/xe_pci.c:65:19: note: declared here
65 | KUNIT_ARRAY_PARAM(platform, cases, xe_pci_fake_data_desc);
| ^~~~~~~~
include/kunit/test.h:1729:28: note: in definition of macro 'KUNIT_ARRAY_PARAM'
1729 | static const void *name##_gen_params(struct kunit *test, \
| ^~~~
drivers/gpu/drm/xe/tests/xe_pci.c:81:1: error: control reaches end of non-void function [-Werror=return-type]
81 | }
| ^
cc1: all warnings being treated as errors
Caused by commit
b9a214b5f6aa ("kunit: Pass parameterized test context to generate_params()")
interacting with comit
a9c8517058cc ("drm/xe/kunit: Promote fake platform parameter list")
from the drm-xe tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 8 Sep 2025 17:15:21 +1000
Subject: [PATCH] fix up for "kunit: Pass parameterized test context to
generate_params()"
interacting with "drm/xe/kunit: Promote fake platform parameter list"
from the drm-xe tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/gpu/drm/xe/tests/xe_pci.c | 5 +++--
drivers/gpu/drm/xe/tests/xe_pci_test.h | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_pci.c b/drivers/gpu/drm/xe/tests/xe_pci.c
index e29ec1ce7231..c789bfb8af96 100644
--- a/drivers/gpu/drm/xe/tests/xe_pci.c
+++ b/drivers/gpu/drm/xe/tests/xe_pci.c
@@ -66,6 +66,7 @@ KUNIT_ARRAY_PARAM(platform, cases, xe_pci_fake_data_desc);
/**
* xe_pci_fake_data_gen_params - Generate struct xe_pci_fake_data parameters
+ * @test: a test pointer
* @prev: the pointer to the previous parameter to iterate from or NULL
* @desc: output buffer with minimum size of KUNIT_PARAM_DESC_SIZE
*
@@ -75,9 +76,9 @@ KUNIT_ARRAY_PARAM(platform, cases, xe_pci_fake_data_desc);
*
* Return: pointer to the next parameter or NULL if no more parameters
*/
-const void *xe_pci_fake_data_gen_params(const void *prev, char *desc)
+const void *xe_pci_fake_data_gen_params(struct kunit *test, const void *prev, char *desc)
{
- return platform_gen_params(prev, desc);
+ return platform_gen_params(test, prev, desc);
}
EXPORT_SYMBOL_IF_KUNIT(xe_pci_fake_data_gen_params);
diff --git a/drivers/gpu/drm/xe/tests/xe_pci_test.h b/drivers/gpu/drm/xe/tests/xe_pci_test.h
index e2f8d65e9e33..30505d1cbefc 100644
--- a/drivers/gpu/drm/xe/tests/xe_pci_test.h
+++ b/drivers/gpu/drm/xe/tests/xe_pci_test.h
@@ -25,7 +25,7 @@ struct xe_pci_fake_data {
};
int xe_pci_fake_device_init(struct xe_device *xe);
-const void *xe_pci_fake_data_gen_params(const void *prev, char *desc);
+const void *xe_pci_fake_data_gen_params(struct kunit *test, const void *prev, char *desc);
void xe_pci_fake_data_desc(const struct xe_pci_fake_data *param, char *desc);
const void *xe_pci_graphics_ip_gen_param(struct kunit *test, const void *prev, char *desc);
--
2.51.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-08 7:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-08 7:29 Stephen Rothwell [this message]
2025-09-08 13:26 ` linux-next: manual merge of the kunit-next tree with the drm-xe tree Lucas De Marchi
2025-09-08 22:33 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-09-18 14:39 Mark Brown
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=20250908172938.68a86c52@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davidgow@google$(echo .)com \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=marievic@google$(echo .)com \
--cc=michal.wajdeczko@intel$(echo .)com \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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