Unverified Commit 723d5a70 authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Maxime Ripard
Browse files

drm/tests: hdmi: Switch to drm_atomic_get_new_connector_state() where possible 



Replace the calls to drm_atomic_get_connector_state() with
drm_atomic_get_new_connector_state() for cases which do not require
allocating the connector state, e.g. after drm_atomic_check_only() when
the intent is to only read the new connector state.

The rational is to avoid the need to handle the potential EDEADLK error
returned by the former helper, which would require restarting the entire
atomic sequence.

Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20250527-hdmi-conn-yuv-v5-13-74c9c4a8ac0c@collabora.com


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

drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

+6 −6
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test) 
	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	conn_state = drm_atomic_get_new_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	KUNIT_EXPECT_TRUE(test, conn_state->hdmi.is_limited_range);
@@ -476,7 +476,7 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode_vic_1(struct kunit *test) 
	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	conn_state = drm_atomic_get_new_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	KUNIT_EXPECT_FALSE(test, conn_state->hdmi.is_limited_range);
@@ -535,7 +535,7 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test) 
	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	conn_state = drm_atomic_get_new_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	KUNIT_ASSERT_EQ(test,
@@ -597,7 +597,7 @@ static void drm_test_check_broadcast_rgb_full_cea_mode_vic_1(struct kunit *test) 
	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	conn_state = drm_atomic_get_new_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	KUNIT_ASSERT_EQ(test,
@@ -660,7 +660,7 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test) 
	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	conn_state = drm_atomic_get_new_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	KUNIT_ASSERT_EQ(test,
@@ -722,7 +722,7 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode_vic_1(struct kunit *te 
	ret = drm_atomic_check_only(state);

	KUNIT_ASSERT_EQ(test, ret, 0);



	conn_state = drm_atomic_get_connector_state(state, conn);

	conn_state = drm_atomic_get_new_connector_state(state, conn);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);



	KUNIT_ASSERT_EQ(test,