@@ -4789,12 +4792,321 @@ static struct kunit_suite drm_atomic_helper_connector_hdmi_scrambling_test_suite
.test_cases = drm_atomic_helper_connector_hdmi_scrambling_tests,
};
+static const struct drm_edid *test_read_edid(struct drm_connector *connector)
+{
+ struct drm_atomic_helper_connector_hdmi_priv *priv =
+ connector_to_priv(connector);
+
+ return drm_edid_alloc(priv->current_edid, priv->current_edid_len);
+}
+
+static const struct drm_connector_hdmi_funcs scdc_read_edid_connector_hdmi_funcs = {
+ .vendor = "Vendor",
+ .product = "Product",
+ .supported_hdmi_ver = HDMI_VERSION_2_0,
+ .supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444),
+ .max_bpc = 8,
+ .read_edid = test_read_edid,
+ .scrambler_enable = count_scrambler_enable,
+ .scrambler_disable = count_scrambler_disable,
+ .avi = {
+ .clear_infoframe = accept_infoframe_clear_infoframe,
+ .write_infoframe = accept_infoframe_write_infoframe,
+ },
+ .hdmi = {
+ .clear_infoframe = accept_infoframe_clear_infoframe,
+ .write_infoframe = accept_infoframe_write_infoframe,
+ },
+};
+
+/*
+ * Sets up an HDMI 2.0 connector attached to a sink supporting scrambling and
+ * drives the given CEA mode on it, leaving the locks held in @ctx.
+ */
+static struct drm_atomic_helper_connector_hdmi_priv *
+sync_scdc_test_init(struct kunit *test,
+ const struct drm_connector_hdmi_funcs *hdmi_funcs,
+ u8 vic, struct drm_modeset_acquire_ctx *ctx)
+{
+ struct drm_atomic_helper_connector_hdmi_priv *priv;
+ struct drm_display_mode *mode;
+ int ret;
+
+ priv = drm_kunit_helper_connector_hdmi_init_with_scdc(test, hdmi_funcs,
+ test_edid_hdmi_4k_rgb_yuv420_dc_max_600mhz);
+ KUNIT_ASSERT_NOT_NULL(test, priv);
+
+ drm_encoder_helper_add(&priv->encoder, &test_encoder_helper_funcs);
+
+ mode = drm_kunit_display_mode_from_cea_vic(test, &priv->drm, vic);
+ KUNIT_ASSERT_NOT_NULL(test, mode);
+
+ drm_modeset_acquire_init(ctx, 0);
+
+retry_conn_enable:
+ ret = drm_kunit_helper_enable_crtc_connector(test, &priv->drm,
+ priv->crtc,
+ &priv->connector,
+ mode, ctx);
+ if (ret == -EDEADLK) {
+ ret = drm_modeset_backoff(ctx);
+ if (!ret)
+ goto retry_conn_enable;
+ }
+ KUNIT_ASSERT_EQ(test, ret, 0);
+ KUNIT_ASSERT_EQ(test, priv->encoder_enable_count, 1);
+
+ return priv;
+}
+
+struct drm_hdmi_sync_scdc_test {
+ const char *desc;
+ u8 vic;
+ bool plugged;
+ u8 tmds_config;
+ int xfer_err;
+ int expected_ret;
+ bool expected_reset;
+};
+
+static const struct drm_hdmi_sync_scdc_test drm_hdmi_sync_scdc_params[] = {
+ {
+ .desc = "scrambling lost",
+ .vic = 97,
+ .plugged = true,
+ .expected_reset = true,
+ },
+ {
+ .desc = "scrambling active",
+ .vic = 97,
+ .plugged = true,
+ .tmds_config = SCDC_SCRAMBLING_ENABLE,
+ },
+ {
+ .desc = "scrambling not needed",
+ .vic = 16,
+ .plugged = true,
+ },
+ {
+ .desc = "unplugged",
+ .vic = 97,
+ .plugged = false,
+ },
+ {
+ .desc = "ddc error",
+ .vic = 97,
+ .plugged = true,
+ .xfer_err = -EIO,
+ .expected_ret = -EIO,
+ },
+};
+
+static void drm_hdmi_sync_scdc_desc(const struct drm_hdmi_sync_scdc_test *t,
+ char *desc)
+{
+ strscpy(desc, t->desc, KUNIT_PARAM_DESC_SIZE);
+}
+
+KUNIT_ARRAY_PARAM(drm_hdmi_sync_scdc, drm_hdmi_sync_scdc_params,
+ drm_hdmi_sync_scdc_desc);
+
+/*
+ * Test that drm_connector_hdmi_sync_scdc() resets the CRTC to restore the sink
+ * scrambling setup only when the sink got (re)plugged, the active mode needs
+ * scrambling and the sink reports it as disabled.
+ */
+static void drm_test_hdmi_sync_scdc(struct kunit *test)
+{
+ const struct drm_hdmi_sync_scdc_test *params = test->param_value;
+ struct drm_atomic_helper_connector_hdmi_priv *priv;
+ struct drm_modeset_acquire_ctx ctx;
+ unsigned int xfer_count;
+ int ret;
+
+ priv = sync_scdc_test_init(test, &scdc_connector_hdmi_funcs,
+ params->vic, &ctx);
+
+ KUNIT_ASSERT_EQ(test, priv->connector.state->hdmi.scrambler_needed,
+ params->vic == 97);
+
+ priv->scdc_regs[SCDC_TMDS_CONFIG] = params->tmds_config;
+ priv->scdc_xfer_err = params->xfer_err;
+ xfer_count = priv->scdc_xfer_count;
+
+retry:
+ ret = drm_connector_hdmi_sync_scdc(&priv->connector, params->plugged, &ctx);
+ if (ret == -EDEADLK) {
+ ret = drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
+ KUNIT_EXPECT_EQ(test, ret, params->expected_ret);
+
+ KUNIT_EXPECT_EQ(test, priv->encoder_enable_count,
+ params->expected_reset ? 2 : 1);
+
+ if (!params->plugged || params->vic != 97)
+ KUNIT_EXPECT_EQ(test, priv->scdc_xfer_count, xfer_count);
+
+ drm_modeset_drop_locks(&ctx);
+ drm_modeset_acquire_fini(&ctx);
+}
+
+struct drm_hdmi_sync_scdc_hotplug_test {
+ const char *desc;
+ bool sink_reset;
+};
+
+static const struct drm_hdmi_sync_scdc_hotplug_test
+drm_hdmi_sync_scdc_hotplug_params[] = {
+ { .desc = "sink setup lost", .sink_reset = true, },
+ { .desc = "sink setup kept", .sink_reset = false, },
+};
+
+static void
+drm_hdmi_sync_scdc_hotplug_desc(const struct drm_hdmi_sync_scdc_hotplug_test *t,
+ char *desc)
+{
+ strscpy(desc, t->desc, KUNIT_PARAM_DESC_SIZE);
+}
+
+KUNIT_ARRAY_PARAM(drm_hdmi_sync_scdc_hotplug,
+ drm_hdmi_sync_scdc_hotplug_params,
+ drm_hdmi_sync_scdc_hotplug_desc);
+
+/*
+ * Test that drm_atomic_helper_connector_hdmi_hotplug() leaves the pipeline
+ * alone on disconnect, while on reconnect it restores the sink scrambling
+ * setup only if the sink lost it while being unplugged.
+ */
+static void drm_test_hdmi_sync_scdc_hotplug(struct kunit *test)
+{
+ const struct drm_hdmi_sync_scdc_hotplug_test *params = test->param_value;
+ struct drm_atomic_helper_connector_hdmi_priv *priv;
+ struct drm_modeset_acquire_ctx ctx;
+ struct drm_connector *conn;
+ int ret;
+
+ priv = sync_scdc_test_init(test, &scdc_read_edid_connector_hdmi_funcs,
+ 97, &ctx);
+ KUNIT_ASSERT_TRUE(test, priv->connector.state->hdmi.scrambler_needed);
+
+ priv->scdc_regs[SCDC_TMDS_CONFIG] = SCDC_SCRAMBLING_ENABLE;
+ conn = &priv->connector;
+
+retry_disconnect:
+ ret = drm_atomic_helper_connector_hdmi_hotplug(conn, &ctx,
+ connector_status_disconnected);
+ if (ret == -EDEADLK) {
+ ret = drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_disconnect;
+ }
+ KUNIT_EXPECT_EQ(test, ret, 0);
+ KUNIT_EXPECT_EQ(test, priv->encoder_enable_count, 1);
+ KUNIT_EXPECT_FALSE(test, conn->display_info.is_hdmi);
+
+ /* Simulate the sink losing its SCDC setup while being unplugged */
+ if (params->sink_reset)
+ priv->scdc_regs[SCDC_TMDS_CONFIG] = 0;
+
+retry_connect:
+ ret = drm_atomic_helper_connector_hdmi_hotplug(conn, &ctx,
+ connector_status_connected);
+ if (ret == -EDEADLK) {
+ ret = drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry_connect;
+ }
+ KUNIT_EXPECT_EQ(test, ret, 0);
+ KUNIT_EXPECT_TRUE(test, conn->display_info.hdmi.scdc.scrambling.supported);
+ KUNIT_EXPECT_EQ(test, priv->encoder_enable_count,
+ params->sink_reset ? 2 : 1);
+
+ drm_modeset_drop_locks(&ctx);
+ drm_modeset_acquire_fini(&ctx);
+}
+
+/*
+ * Test that drm_atomic_helper_connector_hdmi_hotplug() doesn't report SCDC
+ * errors, as .detect_ctx() may only return a connector status or -EDEADLK.
+ */
+static void drm_test_hdmi_sync_scdc_hotplug_ddc_error(struct kunit *test)
+{
+ struct drm_atomic_helper_connector_hdmi_priv *priv;
+ struct drm_modeset_acquire_ctx ctx;
+ int ret;
+
+ priv = sync_scdc_test_init(test, &scdc_read_edid_connector_hdmi_funcs,
+ 97, &ctx);
+
+ priv->scdc_xfer_err = -EIO;
+
+retry:
+ ret = drm_atomic_helper_connector_hdmi_hotplug(&priv->connector, &ctx,
+ connector_status_connected);
+ if (ret == -EDEADLK) {
+ ret = drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
+ KUNIT_EXPECT_EQ(test, ret, 0);
+ KUNIT_EXPECT_EQ(test, priv->encoder_enable_count, 1);
+
+ drm_modeset_drop_locks(&ctx);
+ drm_modeset_acquire_fini(&ctx);
+}
+
+/*
+ * Test that drm_atomic_helper_connector_hdmi_force_ctx() restores the sink
+ * scrambling setup of a connector forced on.
+ */
+static void drm_test_hdmi_sync_scdc_force_ctx(struct kunit *test)
+{
+ struct drm_atomic_helper_connector_hdmi_priv *priv;
+ struct drm_modeset_acquire_ctx ctx;
+ int ret;
+
+ priv = sync_scdc_test_init(test, &scdc_read_edid_connector_hdmi_funcs,
+ 97, &ctx);
+
+ KUNIT_ASSERT_EQ(test, priv->connector.status, connector_status_connected);
+
+retry:
+ ret = drm_atomic_helper_connector_hdmi_force_ctx(&priv->connector, &ctx);
+ if (ret == -EDEADLK) {
+ ret = drm_modeset_backoff(&ctx);
+ if (!ret)
+ goto retry;
+ }
+ KUNIT_EXPECT_EQ(test, ret, 0);
+ KUNIT_EXPECT_EQ(test, priv->encoder_enable_count, 2);
+
+ drm_modeset_drop_locks(&ctx);
+ drm_modeset_acquire_fini(&ctx);
+}
+
+static struct kunit_case drm_atomic_helper_connector_hdmi_sync_scdc_tests[] = {
+ KUNIT_CASE_PARAM(drm_test_hdmi_sync_scdc, drm_hdmi_sync_scdc_gen_params),
+ KUNIT_CASE_PARAM(drm_test_hdmi_sync_scdc_hotplug,
+ drm_hdmi_sync_scdc_hotplug_gen_params),
+ KUNIT_CASE(drm_test_hdmi_sync_scdc_hotplug_ddc_error),
+ KUNIT_CASE(drm_test_hdmi_sync_scdc_force_ctx),
+ { }
+};
+
+static struct kunit_suite drm_atomic_helper_connector_hdmi_sync_scdc_test_suite = {
+ .name = "drm_atomic_helper_connector_hdmi_sync_scdc",
+ .test_cases = drm_atomic_helper_connector_hdmi_sync_scdc_tests,
+};
+
kunit_test_suites(
&drm_atomic_helper_connector_hdmi_check_test_suite,
&drm_atomic_helper_connector_hdmi_reset_test_suite,
&drm_atomic_helper_connector_hdmi_mode_valid_test_suite,
&drm_atomic_helper_connector_hdmi_infoframes_test_suite,
&drm_atomic_helper_connector_hdmi_scrambling_test_suite,
+ &drm_atomic_helper_connector_hdmi_sync_scdc_test_suite,
);
MODULE_AUTHOR("Maxime Ripard <mripard@kernel.org>");