drm/tests: hdmi_state_helpers: Switch to new helper

We introduced a new helper that supersedes the light_up_connector()
function in drm_hdmi_state_helper_test, so let's convert all our tests
to it.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250313-bridge-connector-v6-6-511c54a604fb@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

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 e97efd3af9ed18e6cf8ee66b4923dfc805b34e19..7ffd666753b10bc991894e238206a3c5328d0e23 100644 (file)
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -55,49 +55,6 @@ static struct drm_display_mode *find_preferred_mode(struct drm_connector *connec
        return preferred;
 }
 
-static int light_up_connector(struct kunit *test,
-                             struct drm_device *drm,
-                             struct drm_crtc *crtc,
-                             struct drm_connector *connector,
-                             struct drm_display_mode *mode,
-                             struct drm_modeset_acquire_ctx *ctx)
-{
-       struct drm_atomic_state *state;
-       struct drm_connector_state *conn_state;
-       struct drm_crtc_state *crtc_state;
-       int ret;
-
-       state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-
-retry:
-       conn_state = drm_atomic_get_connector_state(state, connector);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
-
-       ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
-       if (ret == -EDEADLK) {
-               drm_atomic_state_clear(state);
-               ret = drm_modeset_backoff(ctx);
-               if (!ret)
-                       goto retry;
-       }
-       KUNIT_EXPECT_EQ(test, ret, 0);
-
-       crtc_state = drm_atomic_get_crtc_state(state, crtc);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
-
-       ret = drm_atomic_set_mode_for_crtc(crtc_state, mode);
-       KUNIT_EXPECT_EQ(test, ret, 0);
-
-       crtc_state->enable = true;
-       crtc_state->active = true;
-
-       ret = drm_atomic_commit(state);
-       KUNIT_ASSERT_EQ(test, ret, 0);
-
-       return 0;
-}
-
 static int set_connector_edid(struct kunit *test, struct drm_connector *connector,
                              const char *edid, size_t edid_len)
 {
@@ -298,7 +255,10 @@ static void drm_test_check_broadcast_rgb_crtc_mode_changed(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -364,7 +324,10 @@ static void drm_test_check_broadcast_rgb_crtc_mode_not_changed(struct kunit *tes
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -432,7 +395,10 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -489,7 +455,10 @@ 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 = light_up_connector(test, drm, crtc, conn, mode, &ctx);
+       ret = drm_kunit_helper_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);
@@ -547,7 +516,10 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -606,7 +578,10 @@ 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 = light_up_connector(test, drm, crtc, conn, mode, &ctx);
+       ret = drm_kunit_helper_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);
@@ -666,7 +641,10 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -725,7 +703,10 @@ 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 = light_up_connector(test, drm, crtc, conn, mode, &ctx);
+       ret = drm_kunit_helper_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);
@@ -789,7 +770,10 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -865,7 +849,10 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);
@@ -941,7 +928,10 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -988,7 +978,10 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1037,7 +1030,10 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1086,7 +1082,10 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1134,7 +1133,10 @@ static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
        /* You shouldn't be doing that at home. */
@@ -1208,7 +1210,10 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1282,7 +1287,10 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1347,7 +1355,10 @@ static void drm_test_check_output_bpc_format_vic_1(struct kunit *test)
        drm_modeset_acquire_init(&ctx, 0);
 
        crtc = priv->crtc;
-       ret = light_up_connector(test, drm, crtc, conn, mode, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    mode,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1414,7 +1425,10 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1483,7 +1497,10 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1543,7 +1560,10 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1605,7 +1625,10 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_enable_crtc_connector(test, drm,
+                                                    crtc, conn,
+                                                    preferred,
+                                                    &ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
        conn_state = conn->state;
@@ -1645,7 +1668,10 @@ static void drm_test_check_disable_connector(struct kunit *test)
 
        drm = &priv->drm;
        crtc = priv->crtc;
-       ret = light_up_connector(test, drm, crtc, conn, preferred, &ctx);
+       ret = drm_kunit_helper_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);