[PATCH v3 6/9] drm/xe/kunit: Use xe kunit helpers in RTP test

Michal Wajdeczko michal.wajdeczko at intel.com
Mon Dec 11 20:04:21 UTC 2023


Replace local solution with common helper code.

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_rtp_test.c | 36 ++------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/drivers/gpu/drm/xe/tests/xe_rtp_test.c b/drivers/gpu/drm/xe/tests/xe_rtp_test.c
index 4a6972897675..1c4693ec94b8 100644
--- a/drivers/gpu/drm/xe/tests/xe_rtp_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_rtp_test.c
@@ -15,6 +15,7 @@
 #include "regs/xe_reg_defs.h"
 #include "xe_device.h"
 #include "xe_device_types.h"
+#include "xe_kunit_helpers.h"
 #include "xe_pci_test.h"
 #include "xe_reg_sr.h"
 #include "xe_rtp.h"
@@ -267,38 +268,6 @@ static void rtp_desc(const struct rtp_test_case *t, char *desc)
 
 KUNIT_ARRAY_PARAM(rtp, cases, rtp_desc);
 
-static int xe_rtp_test_init(struct kunit *test)
-{
-	struct xe_device *xe;
-	struct device *dev;
-	int ret;
-
-	dev = drm_kunit_helper_alloc_device(test);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
-
-	xe = drm_kunit_helper_alloc_drm_device(test, dev,
-					       struct xe_device,
-					       drm, DRIVER_GEM);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xe);
-
-	/* Initialize an empty device */
-	test->priv = NULL;
-	ret = xe_pci_fake_device_init(xe);
-	KUNIT_ASSERT_EQ(test, ret, 0);
-
-	xe->drm.dev = dev;
-	test->priv = xe;
-
-	return 0;
-}
-
-static void xe_rtp_test_exit(struct kunit *test)
-{
-	struct xe_device *xe = test->priv;
-
-	drm_kunit_helper_free_device(test, xe->drm.dev);
-}
-
 static struct kunit_case xe_rtp_tests[] = {
 	KUNIT_CASE_PARAM(xe_rtp_process_tests, rtp_gen_params),
 	{}
@@ -306,8 +275,7 @@ static struct kunit_case xe_rtp_tests[] = {
 
 static struct kunit_suite xe_rtp_test_suite = {
 	.name = "xe_rtp",
-	.init = xe_rtp_test_init,
-	.exit = xe_rtp_test_exit,
+	.init = xe_kunit_helper_xe_device_test_init,
 	.test_cases = xe_rtp_tests,
 };
 
-- 
2.25.1



More information about the Intel-xe mailing list