From: David Gow <davidgow@google•com>
To: Rae Moar <rmoar@google•com>,
Marie Zhussupova <marievic@google•com>,
marievictoria875@gmail•com,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Shuah Khan <skhan@linuxfoundation•org>
Cc: David Gow <davidgow@google•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
intel-xe@lists•freedesktop.org, kunit-dev@googlegroups•com,
linux-kselftest@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [PATCH v2 1/2] drm/xe/tests: Fix some additional gen_params signatures
Date: Thu, 21 Aug 2025 21:54:44 +0800 [thread overview]
Message-ID: <20250821135447.1618942-1-davidgow@google.com> (raw)
In 444be9072fca ("kunit: Pass parameterized test context to generate_params()")
prototype used for gen_params functions was changed to add a struct
kunit parameter. However, a few of these used in xe were not updated.
Update these so that the xe_pci tests build and run again.
Fixes: 444be9072fca ("kunit: Pass parameterized test context to generate_params()")
Signed-off-by: David Gow <davidgow@google•com>
---
Sorry, the last fix here caused a warning (thanks to the test robot for
finding it).
I'm still happy to sqash and re-send the whole original series if that's
preferred.
Changes since v1:
https://lore.kernel.org/linux-kselftest/20250819073434.1411114-1-davidgow@google.com/
- Add the missing <kunit/test.h> include for struct kunit
---
drivers/gpu/drm/xe/tests/xe_pci.c | 12 ++++++------
drivers/gpu/drm/xe/tests/xe_pci_test.h | 9 +++++----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_pci.c b/drivers/gpu/drm/xe/tests/xe_pci.c
index a65705814b9a..f707e0a54295 100644
--- a/drivers/gpu/drm/xe/tests/xe_pci.c
+++ b/drivers/gpu/drm/xe/tests/xe_pci.c
@@ -44,9 +44,9 @@ KUNIT_ARRAY_PARAM(pci_id, pciidlist, xe_pci_id_kunit_desc);
*
* Return: pointer to the next parameter or NULL if no more parameters
*/
-const void *xe_pci_graphics_ip_gen_param(const void *prev, char *desc)
+const void *xe_pci_graphics_ip_gen_param(struct kunit *test, const void *prev, char *desc)
{
- return graphics_ip_gen_params(prev, desc);
+ return graphics_ip_gen_params(test, prev, desc);
}
EXPORT_SYMBOL_IF_KUNIT(xe_pci_graphics_ip_gen_param);
@@ -61,9 +61,9 @@ EXPORT_SYMBOL_IF_KUNIT(xe_pci_graphics_ip_gen_param);
*
* Return: pointer to the next parameter or NULL if no more parameters
*/
-const void *xe_pci_media_ip_gen_param(const void *prev, char *desc)
+const void *xe_pci_media_ip_gen_param(struct kunit *test, const void *prev, char *desc)
{
- return media_ip_gen_params(prev, desc);
+ return media_ip_gen_params(test, prev, desc);
}
EXPORT_SYMBOL_IF_KUNIT(xe_pci_media_ip_gen_param);
@@ -78,9 +78,9 @@ EXPORT_SYMBOL_IF_KUNIT(xe_pci_media_ip_gen_param);
*
* Return: pointer to the next parameter or NULL if no more parameters
*/
-const void *xe_pci_id_gen_param(const void *prev, char *desc)
+const void *xe_pci_id_gen_param(struct kunit *test, const void *prev, char *desc)
{
- const struct pci_device_id *pci = pci_id_gen_params(prev, desc);
+ const struct pci_device_id *pci = pci_id_gen_params(test, prev, desc);
return pci->driver_data ? pci : NULL;
}
diff --git a/drivers/gpu/drm/xe/tests/xe_pci_test.h b/drivers/gpu/drm/xe/tests/xe_pci_test.h
index ce4d2b86b778..6d8bc56f7bde 100644
--- a/drivers/gpu/drm/xe/tests/xe_pci_test.h
+++ b/drivers/gpu/drm/xe/tests/xe_pci_test.h
@@ -7,6 +7,7 @@
#define _XE_PCI_TEST_H_
#include <linux/types.h>
+#include <kunit/test.h>
#include "xe_platform_types.h"
#include "xe_sriov_types.h"
@@ -25,9 +26,9 @@ struct xe_pci_fake_data {
int xe_pci_fake_device_init(struct xe_device *xe);
-const void *xe_pci_graphics_ip_gen_param(const void *prev, char *desc);
-const void *xe_pci_media_ip_gen_param(const void *prev, char *desc);
-const void *xe_pci_id_gen_param(const void *prev, char *desc);
-const void *xe_pci_live_device_gen_param(const void *prev, char *desc);
+const void *xe_pci_graphics_ip_gen_param(struct kunit *test, const void *prev, char *desc);
+const void *xe_pci_media_ip_gen_param(struct kunit *test, const void *prev, char *desc);
+const void *xe_pci_id_gen_param(struct kunit *test, const void *prev, char *desc);
+const void *xe_pci_live_device_gen_param(struct kunit *test, const void *prev, char *desc);
#endif
--
2.51.0.rc2.233.g662b1ed5c5-goog
next reply other threads:[~2025-08-21 13:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-21 13:54 David Gow [this message]
2025-08-21 13:54 ` [PATCH v2 2/2] kunit: Only output a test plan if we're using kunit_array_gen_params David Gow
2025-08-21 20:17 ` Rae Moar
2025-08-21 20:16 ` [PATCH v2 1/2] drm/xe/tests: Fix some additional gen_params signatures Rae Moar
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=20250821135447.1618942-1-davidgow@google.com \
--to=davidgow@google$(echo .)com \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=kunit-dev@googlegroups$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-kselftest@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marievic@google$(echo .)com \
--cc=marievictoria875@gmail$(echo .)com \
--cc=rmoar@google$(echo .)com \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=skhan@linuxfoundation$(echo .)org \
/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