Unverified Commit 30188df0 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/tests: Drop drm_kunit_helper_acquire_ctx_alloc() 



lockdep complains when a lock is released in a separate thread the
lock is taken in, and it turns out that kunit does run its actions in a
separate thread than the test ran in.

This means that drm_kunit_helper_acquire_ctx_alloc() just cannot work as
it's supposed to, so let's just get rid of it.

Suggested-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250220132537.2834168-1-mripard@kernel.org


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

drivers/gpu/drm/tests/drm_atomic_state_test.c

+14 −10
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int set_up_atomic_state(struct kunit *test, 
static void drm_test_check_connector_changed_modeset(struct kunit *test)

{

	struct drm_atomic_test_priv *priv;

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_modeset_acquire_ctx ctx;

	struct drm_connector *old_conn, *new_conn;

	struct drm_atomic_state *state;

	struct drm_device *drm;
@@ -203,14 +203,13 @@ static void drm_test_check_connector_changed_modeset(struct kunit *test) 
	old_conn = &priv->connectors[0];

	new_conn = &priv->connectors[1];



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);

	drm_modeset_acquire_init(&ctx, 0);



	// first modeset to enable

	ret = set_up_atomic_state(test, priv, old_conn, ctx);

	ret = set_up_atomic_state(test, priv, old_conn, &ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);



	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	new_conn_state = drm_atomic_get_connector_state(state, new_conn);
@@ -231,6 +230,9 @@ static void drm_test_check_connector_changed_modeset(struct kunit *test) 
	ret = drm_atomic_commit(state);

	KUNIT_ASSERT_EQ(test, ret, 0);

	KUNIT_ASSERT_EQ(test, modeset_counter, initial_modeset_count + 1);



	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

}



/*
@@ -263,7 +265,7 @@ static void drm_test_check_valid_clones(struct kunit *test) 
	int ret;

	const struct drm_clone_mode_test *param = test->param_value;

	struct drm_atomic_test_priv *priv;

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_modeset_acquire_ctx ctx;

	struct drm_device *drm;

	struct drm_atomic_state *state;

	struct drm_crtc_state *crtc_state;
@@ -273,13 +275,12 @@ static void drm_test_check_valid_clones(struct kunit *test) 


	drm = &priv->drm;



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);

	drm_modeset_acquire_init(&ctx, 0);



	ret = set_up_atomic_state(test, priv, NULL, ctx);

	ret = set_up_atomic_state(test, priv, NULL, &ctx);

	KUNIT_ASSERT_EQ(test, ret, 0);



	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	crtc_state = drm_atomic_get_crtc_state(state, priv->crtc);
@@ -292,6 +293,9 @@ static void drm_test_check_valid_clones(struct kunit *test) 


	ret = drm_atomic_helper_check_modeset(drm, state);

	KUNIT_ASSERT_EQ(test, ret, param->expected_result);



	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

}



static void drm_check_in_clone_mode_desc(const struct drm_clone_mode_test *t,

drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

+150 −104

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/tests/drm_kunit_helpers.c

+0 −41
Original line number Diff line number Diff line
@@ -80,47 +80,6 @@ __drm_kunit_helper_alloc_drm_device_with_driver(struct kunit *test, 
}

EXPORT_SYMBOL_GPL(__drm_kunit_helper_alloc_drm_device_with_driver);



static void action_drm_release_context(void *ptr)

{

	struct drm_modeset_acquire_ctx *ctx = ptr;



	drm_modeset_drop_locks(ctx);

	drm_modeset_acquire_fini(ctx);

}



/**

 * drm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context

 * @test: The test context object

 *

 * Allocates and initializes a modeset acquire context.

 *

 * The context is tied to the kunit test context, so we must not call

 * drm_modeset_acquire_fini() on it, it will be done so automatically.

 *

 * Returns:

 * An ERR_PTR on error, a pointer to the newly allocated context otherwise

 */

struct drm_modeset_acquire_ctx *

drm_kunit_helper_acquire_ctx_alloc(struct kunit *test)

{

	struct drm_modeset_acquire_ctx *ctx;

	int ret;



	ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL);

	KUNIT_ASSERT_NOT_NULL(test, ctx);



	drm_modeset_acquire_init(ctx, 0);



	ret = kunit_add_action_or_reset(test,

					action_drm_release_context,

					ctx);

	if (ret)

		return ERR_PTR(ret);



	return ctx;

}

EXPORT_SYMBOL_GPL(drm_kunit_helper_acquire_ctx_alloc);



static void kunit_action_drm_atomic_state_put(void *ptr)

{

	struct drm_atomic_state *state = ptr;

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

+27 −19
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static void drm_vc4_test_pv_muxing_invalid(struct kunit *test) 
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_modeset_acquire_ctx ctx;

	struct pv_muxing_priv *priv;

	struct drm_device *drm;

	struct vc4_dev *vc4;
@@ -737,13 +737,15 @@ static int vc4_pv_muxing_test_init(struct kunit *test) 
	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);

	priv->vc4 = vc4;



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);

	drm_modeset_acquire_init(&ctx, 0);



	drm = &vc4->base;

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

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

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->state);



	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);



	return 0;

}
@@ -782,7 +784,7 @@ static struct kunit_suite vc5_pv_muxing_test_suite = { 
 */

static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *test)

{

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_modeset_acquire_ctx ctx;

	struct drm_atomic_state *state;

	struct vc4_crtc_state *new_vc4_crtc_state;

	struct vc4_hvs_state *new_hvs_state;
@@ -795,11 +797,10 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes 
	vc4 = vc5_mock_device(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);

	drm_modeset_acquire_init(&ctx, 0);



	drm = &vc4->base;

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
@@ -822,7 +823,7 @@ 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);



	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
@@ -843,6 +844,9 @@ 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_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

}



/*
@@ -854,7 +858,7 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *tes 
 */

static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test)

{

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_modeset_acquire_ctx ctx;

	struct drm_atomic_state *state;

	struct vc4_crtc_state *new_vc4_crtc_state;

	struct vc4_hvs_state *new_hvs_state;
@@ -867,11 +871,10 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) 
	vc4 = vc5_mock_device(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);

	drm_modeset_acquire_init(&ctx, 0);



	drm = &vc4->base;

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
@@ -905,7 +908,7 @@ 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);



	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	ret = vc4_mock_atomic_del_output(test, state, VC4_ENCODER_TYPE_HDMI0);
@@ -929,6 +932,9 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) 


		KUNIT_EXPECT_EQ(test, old_hdmi1_channel, hdmi1_channel);

	}



	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

}



/*
@@ -949,7 +955,7 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) 
static void

drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct kunit *test)

{

	struct drm_modeset_acquire_ctx *ctx;

	struct drm_modeset_acquire_ctx ctx;

	struct drm_atomic_state *state;

	struct vc4_crtc_state *new_vc4_crtc_state;

	struct drm_device *drm;
@@ -959,11 +965,10 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct ku 
	vc4 = vc5_mock_device(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);



	ctx = drm_kunit_helper_acquire_ctx_alloc(test);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);

	drm_modeset_acquire_init(&ctx, 0);



	drm = &vc4->base;

	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
@@ -975,7 +980,7 @@ 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);



	state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);

	state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);



	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
@@ -987,6 +992,9 @@ 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_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

}



static struct kunit_case vc5_pv_muxing_bugs_tests[] = {

include/drm/drm_kunit_helpers.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test, 
						      sizeof(_type),		\

						      offsetof(_type, _member),	\

						      _feat))

struct drm_modeset_acquire_ctx *

drm_kunit_helper_acquire_ctx_alloc(struct kunit *test);



struct drm_atomic_state *

drm_kunit_helper_atomic_state_alloc(struct kunit *test,