Commit bd85e00f authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe/kunit: Kill xe_cur_kunit() 



We shouldn't use custom helper if there is a official one.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240705191057.1110-2-michal.wajdeczko@intel.com
parent f6ca930d

drivers/gpu/drm/xe/tests/xe_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void ccs_test_run_tile(struct xe_device *xe, struct xe_tile *tile, 


static int ccs_test_run_device(struct xe_device *xe)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	struct xe_tile *tile;

	int id;
@@ -325,7 +325,7 @@ static int evict_test_run_tile(struct xe_device *xe, struct xe_tile *tile, struc 


static int evict_test_run_device(struct xe_device *xe)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	struct xe_tile *tile;

	int id;

drivers/gpu/drm/xe/tests/xe_dma_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static void check_residency(struct kunit *test, struct xe_bo *exported, 


static void xe_test_dmabuf_import_same_driver(struct xe_device *xe)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	struct dma_buf_test_params *params = to_dma_buf_test_params(test->priv);

	struct drm_gem_object *import;

	struct dma_buf *dmabuf;
@@ -258,7 +258,7 @@ static const struct dma_buf_test_params test_params[] = { 
static int dma_buf_run_device(struct xe_device *xe)

{

	const struct dma_buf_test_params *params;

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();



	xe_pm_runtime_get(xe);

	for (params = test_params; params->mem_mask; ++params) {

drivers/gpu/drm/xe/tests/xe_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test) 


static int migrate_test_run_device(struct xe_device *xe)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	struct xe_tile *tile;

	int id;

drivers/gpu/drm/xe/tests/xe_mocs.c

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct live_mocs { 
static int live_mocs_init(struct live_mocs *arg, struct xe_gt *gt)

{

	unsigned int flags;

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();



	memset(arg, 0, sizeof(*arg));
@@ -41,7 +41,7 @@ static int live_mocs_init(struct live_mocs *arg, struct xe_gt *gt) 
static void read_l3cc_table(struct xe_gt *gt,

			    const struct xe_mocs_info *info)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	u32 l3cc, l3cc_expected;

	unsigned int i;

	u32 reg_val;
@@ -78,7 +78,7 @@ static void read_l3cc_table(struct xe_gt *gt, 
static void read_mocs_table(struct xe_gt *gt,

			    const struct xe_mocs_info *info)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	u32 mocs, mocs_expected;

	unsigned int i;

	u32 reg_val;
@@ -148,7 +148,7 @@ static int mocs_reset_test_run_device(struct xe_device *xe) 
	struct xe_gt *gt;

	unsigned int flags;

	int id;

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();



	xe_pm_runtime_get(xe);

drivers/gpu/drm/xe/tests/xe_pci_test.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


static void check_graphics_ip(const struct xe_graphics_desc *graphics)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	u64 mask = graphics->hw_engine_mask;



	/* RCS, CCS, and BCS engines are allowed on the graphics IP */
@@ -30,7 +30,7 @@ static void check_graphics_ip(const struct xe_graphics_desc *graphics) 


static void check_media_ip(const struct xe_media_desc *media)

{

	struct kunit *test = xe_cur_kunit();

	struct kunit *test = kunit_get_current_test();

	u64 mask = media->hw_engine_mask;



	/* VCS, VECS and GSCCS engines are allowed on the media IP */