Enable automatic handling of EDEADLK by switching from
drm_kunit_helper_enable_crtc_connector() to
drm_kunit_helper_try_enable_crtc_connector().
Signed-off-by: Cristian Ciocaltea <cristian.ciocal...@collabora.com>
---
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 180 ++++++++++-----------
1 file changed, 88 insertions(+), 92 deletions(-)
diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
index
323863a24a498d220f9fb73081abfbb00575c370..c8969ee6518954ab4496d3a4398f428bf4104a36
100644
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -257,10 +257,10 @@ static void
drm_test_check_broadcast_rgb_crtc_mode_changed(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -326,10 +326,10 @@ static void
drm_test_check_broadcast_rgb_crtc_mode_not_changed(struct kunit *tes
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -397,10 +397,10 @@ static void
drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -457,10 +457,9 @@ static void
drm_test_check_broadcast_rgb_auto_cea_mode_vic_1(struct kunit *test)
KUNIT_ASSERT_NOT_NULL(test, mode);
crtc = priv->crtc;
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- mode,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ mode, &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -518,10 +517,10 @@ static void
drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -580,10 +579,9 @@ static void
drm_test_check_broadcast_rgb_full_cea_mode_vic_1(struct kunit *test)
KUNIT_ASSERT_NOT_NULL(test, mode);
crtc = priv->crtc;
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- mode,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ mode, &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -643,10 +641,10 @@ static void
drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -705,10 +703,9 @@ static void
drm_test_check_broadcast_rgb_limited_cea_mode_vic_1(struct kunit *te
KUNIT_ASSERT_NOT_NULL(test, mode);
crtc = priv->crtc;
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- mode,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ mode, &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -769,10 +766,10 @@ static void
drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -845,10 +842,10 @@ static void
drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
@@ -921,10 +918,10 @@ static void drm_test_check_output_bpc_dvi(struct kunit
*test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -968,10 +965,10 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct
kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1017,10 +1014,10 @@ static void
drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1066,10 +1063,10 @@ static void
drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1117,10 +1114,10 @@ static void
drm_test_check_hdmi_funcs_reject_rate(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
/* You shouldn't be doing that at home. */
@@ -1191,10 +1188,10 @@ static void
drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1265,10 +1262,10 @@ static void
drm_test_check_max_tmds_rate_format_fallback(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1330,10 +1327,9 @@ static void
drm_test_check_output_bpc_format_vic_1(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
crtc = priv->crtc;
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- mode,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ mode, &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1397,10 +1393,10 @@ static void
drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1466,10 +1462,10 @@ static void
drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1526,10 +1522,10 @@ static void
drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1588,10 +1584,10 @@ static void
drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
drm_modeset_acquire_init(&ctx, 0);
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_EXPECT_EQ(test, ret, 0);
conn_state = conn->state;
@@ -1631,10 +1627,10 @@ static void drm_test_check_disable_connector(struct
kunit *test)
drm = &priv->drm;
crtc = priv->crtc;
- ret = drm_kunit_helper_enable_crtc_connector(test, drm,
- crtc, conn,
- preferred,
- &ctx);
+ ret = drm_kunit_helper_try_enable_crtc_connector(test, drm,
+ crtc, conn,
+ preferred,
+ &ctx);
KUNIT_ASSERT_EQ(test, ret, 0);
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
--
2.49.0
