drm/tests: hdmi: return meaningful value from set_connector_edid()

The set_connector_edid() function returns a bogus 0, performing the
check on the connector->funcs->fill_modes() result internally. Make the
function pass the fill_modes()'s return value to the caller and move
corresponding checks to the caller site.

Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241130-hdmi-mode-valid-v5-3-742644ec3b1f@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.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 60b1e37522837ee183c65413e3ba6c6ec4fed341..19384b5ff28100b96add35cee86d40cd7d555f1f 100644 (file)
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -105,9 +105,8 @@ static int set_connector_edid(struct kunit *test, struct drm_connector *connecto
        mutex_lock(&drm->mode_config.mutex);
        ret = connector->funcs->fill_modes(connector, 4096, 4096);
        mutex_unlock(&drm->mode_config.mutex);
-       KUNIT_ASSERT_GT(test, ret, 0);
 
-       return 0;
+       return ret;
 }
 
 static const struct drm_connector_hdmi_funcs dummy_connector_hdmi_funcs = {
@@ -223,7 +222,7 @@ drm_kunit_helper_connector_hdmi_init(struct kunit *test,
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        return priv;
 }
@@ -728,7 +727,7 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
@@ -802,7 +801,7 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
@@ -873,7 +872,7 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_dvi_1080p,
                                 ARRAY_SIZE(test_edid_dvi_1080p));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_FALSE(test, info->is_hdmi);
@@ -920,7 +919,7 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
@@ -967,7 +966,7 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
@@ -1014,7 +1013,7 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
@@ -1121,7 +1120,7 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);
@@ -1190,7 +1189,7 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);
@@ -1254,7 +1253,7 @@ static void drm_test_check_output_bpc_format_vic_1(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);
@@ -1314,7 +1313,7 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);
@@ -1381,7 +1380,7 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_200mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);
@@ -1447,7 +1446,7 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);
@@ -1507,7 +1506,7 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_340mhz,
                                 ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_340mhz));
-       KUNIT_ASSERT_EQ(test, ret, 0);
+       KUNIT_ASSERT_GT(test, ret, 0);
 
        info = &conn->display_info;
        KUNIT_ASSERT_TRUE(test, info->is_hdmi);