[PATCH 06/13] drm/xe/kunit: Promote fake BO activation to test_init() helper

[Michal Wajdeczko <michal.wajdeczko@intel.com>]

We already introduced a fake buffer object allocation stub in one
of our kunit tests. Move this stub activation to our test_init()
helper function for easier reuse and to avoid code duplication.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
 drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 33 -----------------
 drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 39 +++++++++++++++++++++
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c b/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c
index 0108316fa64a..a6439e991688 100644
--- a/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c
+++ b/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c
@@ -16,35 +16,6 @@
 #define DUT_GGTT_START		SZ_1M
 #define DUT_GGTT_SIZE		SZ_2M
 
-static struct xe_bo *replacement_xe_managed_bo_create_pin_map(struct xe_device *xe,
-							      struct xe_tile *tile,
-							      size_t size, u32 flags)
-{
-	struct kunit *test = kunit_get_current_test();
-	struct xe_bo *bo;
-	void *buf;
-
-	bo = drmm_kzalloc(&xe->drm, sizeof(*bo), GFP_KERNEL);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bo);
-
-	buf = drmm_kzalloc(&xe->drm, size, GFP_KERNEL);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);
-
-	bo->tile = tile;
-	bo->ttm.bdev = &xe->ttm;
-	bo->ttm.base.size = size;
-	iosys_map_set_vaddr(&bo->vmap, buf);
-
-	if (flags & XE_BO_FLAG_GGTT) {
-		struct xe_ggtt *ggtt = tile->mem.ggtt;
-
-		bo->ggtt_node[tile->id] = xe_ggtt_insert_node(ggtt, xe_bo_size(bo), SZ_4K);
-		KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bo->ggtt_node[tile->id]);
-	}
-
-	return bo;
-}
-
 static int guc_buf_test_init(struct kunit *test)
 {
 	struct xe_pci_fake_data fake = {
@@ -61,10 +32,6 @@ static int guc_buf_test_init(struct kunit *test)
 
 	guc = &xe_device_get_gt(test->priv, 0)->uc.guc;
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, guc);
-
-	kunit_activate_static_stub(test, xe_managed_bo_create_pin_map,
-				   replacement_xe_managed_bo_create_pin_map);
-
 	KUNIT_ASSERT_EQ(test, 0, xe_guc_buf_cache_init(&guc->buf));
 
 	test->priv = &guc->buf;
diff --git a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
index e4495a453f80..8276cabc4820 100644
--- a/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
+++ b/drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
@@ -9,9 +9,11 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_kunit_helpers.h>
+#include <drm/drm_managed.h>
 
 #include "tests/xe_kunit_helpers.h"
 #include "tests/xe_pci_test.h"
+#include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_device_types.h"
 #include "xe_ggtt.h"
@@ -63,6 +65,40 @@ static void fake_device_init_ggtt(struct xe_device *xe, u64 start, u64 size)
 	}
 }
 
+static struct xe_bo *fake_xe_managed_bo_create_pin_map(struct xe_device *xe,
+						       struct xe_tile *tile,
+						       size_t size, u32 flags)
+{
+	struct kunit *test = kunit_get_current_test();
+	struct xe_bo *bo;
+	void *buf;
+
+	KUNIT_EXPECT_TRUE(test, flags & XE_BO_FLAG_SYSTEM);
+	buf = drmm_kzalloc(&xe->drm, size, GFP_KERNEL);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);
+
+	bo = drmm_kzalloc(&xe->drm, sizeof(*bo), GFP_KERNEL);
+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bo);
+
+	bo->tile = tile;
+	bo->ttm.bdev = &xe->ttm;
+	bo->ttm.base.size = size;
+	iosys_map_set_vaddr(&bo->vmap, buf);
+
+	if (flags & XE_BO_FLAG_GGTT) {
+		struct xe_ggtt *ggtt = tile->mem.ggtt;
+		struct xe_ggtt_node *node;
+
+		KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ggtt);
+		node = xe_ggtt_insert_node(ggtt, xe_bo_size(bo), SZ_4K);
+		if (IS_ERR(node))
+			return ERR_CAST(node);
+		bo->ggtt_node[tile->id] = node;
+	}
+
+	return bo;
+}
+
 /**
  * xe_kunit_helper_xe_device_test_init - Prepare a &xe_device for a KUnit test.
  * @test: the &kunit where this fake &xe_device will be used
@@ -106,6 +142,9 @@ int xe_kunit_helper_xe_device_test_init(struct kunit *test)
 	if (data && data->ggtt_size)
 		fake_device_init_ggtt(xe, data->ggtt_start, data->ggtt_size);
 
+	kunit_activate_static_stub(test, xe_managed_bo_create_pin_map,
+				   fake_xe_managed_bo_create_pin_map);
+
 	test->priv = xe;
 	return 0;
 }
-- 
2.47.1