Unverified Commit 1ef726c8 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: tests: Switch to atomic state allocation helper 



Now that we have a helper that takes care of an atomic state allocation
and cleanup, we can migrate to it to simplify our tests.

Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarMaíra Canal <mairacanal@riseup.net>
Link: https://lore.kernel.org/r/20230728-kms-kunit-actions-rework-v3-10-952565ccccfe@kernel.org


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 55ab5e60

drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c

+8 −47
Original line number Diff line number Diff line
@@ -725,7 +725,6 @@ static int vc4_pv_muxing_test_init(struct kunit *test) 
{

	const struct pv_muxing_param *params = test->param_value;

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_atomic_state *state;

	struct pv_muxing_priv *priv;

	struct drm_device *drm;

	struct vc4_dev *vc4;
@@ -742,24 +741,12 @@ static int vc4_pv_muxing_test_init(struct kunit *test) 
	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &vc4->base;

	state = drm_atomic_state_alloc(drm);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	priv->state = state;

	priv->state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->state);



	return 0;

}



static void vc4_pv_muxing_test_exit(struct kunit *test)

{

	struct pv_muxing_priv *priv = test->priv;

	struct drm_atomic_state *state = priv->state;



	drm_atomic_state_put(state);

}



static struct kunit_case vc4_pv_muxing_tests[] = {

	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing,

			 vc4_test_pv_muxing_gen_params),
@@ -771,7 +758,6 @@ static struct kunit_case vc4_pv_muxing_tests[] = { 
static struct kunit_suite vc4_pv_muxing_test_suite = {

	.name = "vc4-pv-muxing-combinations",

	.init = vc4_pv_muxing_test_init,

	.exit = vc4_pv_muxing_test_exit,

	.test_cases = vc4_pv_muxing_tests,

};
@@ -786,7 +772,6 @@ static struct kunit_case vc5_pv_muxing_tests[] = { 
static struct kunit_suite vc5_pv_muxing_test_suite = {

	.name = "vc5-pv-muxing-combinations",

	.init = vc4_pv_muxing_test_init,

	.exit = vc4_pv_muxing_test_exit,

	.test_cases = vc5_pv_muxing_tests,

};
@@ -814,11 +799,9 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes 
	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &vc4->base;

	state = drm_atomic_state_alloc(drm);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -839,13 +822,9 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes 
	ret = drm_atomic_helper_swap_state(state, false);

	KUNIT_ASSERT_EQ(test, ret, 0);



	drm_atomic_state_put(state);



	state = drm_atomic_state_alloc(drm);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -864,8 +843,6 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes 
	KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi1_channel].in_use);



	KUNIT_EXPECT_NE(test, hdmi0_channel, hdmi1_channel);



	drm_atomic_state_put(state);

}



static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test)
@@ -887,11 +864,9 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) 
	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &vc4->base;

	state = drm_atomic_state_alloc(drm);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -923,13 +898,9 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) 
	ret = drm_atomic_helper_swap_state(state, false);

	KUNIT_ASSERT_EQ(test, ret, 0);



	drm_atomic_state_put(state);



	state = drm_atomic_state_alloc(drm);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	ret = vc4_mock_atomic_del_output(test, state, VC4_ENCODER_TYPE_HDMI0);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -951,8 +922,6 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) 


		KUNIT_EXPECT_EQ(test, old_hdmi1_channel, hdmi1_channel);

	}



	drm_atomic_state_put(state);

}



static void
@@ -972,11 +941,9 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct ku 
	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);



	drm = &vc4->base;

	state = drm_atomic_state_alloc(drm);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -986,13 +953,9 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct ku 
	ret = drm_atomic_helper_swap_state(state, false);

	KUNIT_ASSERT_EQ(test, ret, 0);



	drm_atomic_state_put(state);



	state = drm_atomic_state_alloc(drm);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	state->acquire_ctx = ctx;



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);

	KUNIT_ASSERT_EQ(test, ret, 0);
@@ -1002,8 +965,6 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct ku 
	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,

							    VC4_ENCODER_TYPE_HDMI0);

	KUNIT_EXPECT_NULL(test, new_vc4_crtc_state);



	drm_atomic_state_put(state);

}



static struct kunit_case vc5_pv_muxing_bugs_tests[] = {