From nobody Sun Feb 8 20:00:00 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E779B200BBE for ; Tue, 4 Mar 2025 11:11:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086681; cv=none; b=rpYvHmVCqzo7NBSl59pvHPJOQkrkugE7lw8cfOBAhoyC0gvNneK7M4FQnfNI02qoxc78BVkd/XRX2qMdGbWxiQvxieexEmGRKBQYE4bguNEUvwPrr8W+Vfn5wPddB77QShsFHWoOJmwlOKOTMRk9UEIervbF772cUszEQczMBQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086681; c=relaxed/simple; bh=+LGiRKEcCcITA0C2Yd4YksjVY0vEpo6IKjVYAWJOpdQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bNgGx0Xi2Fvb3TTSjvXqmp0G2r8sfm6fuKJOTXDZTgni+E9Hdet5juP+5CoVb/q2jfkW/K0Aa1NMlzEvin1P7MtxyzwGDh12Or8bhtHWRV9xgCqdCTBmgM/MDeqWDfz9PIN7mYxy3scFYbcjocQaNjiVrtJhmSGEpINiSx2VZK8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k4IlYg7H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k4IlYg7H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1916FC4CEEA; Tue, 4 Mar 2025 11:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741086679; bh=+LGiRKEcCcITA0C2Yd4YksjVY0vEpo6IKjVYAWJOpdQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=k4IlYg7HVUNa8YD4gMi8CRWURh2O4g6xpm3gjw9Tk+lHfeRXqiKCaQcE4EjJMeMSZ Hmopuh8FEfSe1rd6koB0COQJwZkV3A6T63Cy5RayC8mm1+LfsfpyIAtsutU4lckF4A gEzm2adGMEF/6Rnb2pqkgiLQJf3rcgYKKMVBFMdBrwHXATnU7Y9WMjRG7vS4K854uy MHnzZD7FpN1ObfP5GVpDdNYmFbBKouWc/RTRAtaCgJ8FYzkG0YtNxc/cWch5qUCGDm 6kXNNzkXCMAj6sw/i/CRvklkzYxVe5CYDOAvraeVHpK6IEwllVm+t3/naXXyRZ0lok VbHBMidqvxSRg== From: Maxime Ripard Date: Tue, 04 Mar 2025 12:10:49 +0100 Subject: [PATCH v5 06/16] drm/tests: hdmi_state_helpers: Switch to new helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250304-bridge-connector-v5-6-aacf461d2157@kernel.org> References: <20250304-bridge-connector-v5-0-aacf461d2157@kernel.org> In-Reply-To: <20250304-bridge-connector-v5-0-aacf461d2157@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Douglas Anderson Cc: Herve Codina , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=15615; i=mripard@kernel.org; h=from:subject:message-id; bh=+LGiRKEcCcITA0C2Yd4YksjVY0vEpo6IKjVYAWJOpdQ=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOnH7u+b67rULuXx8+TYz7+/LXtdE3nNgOdP/6UW16cvt Izyup+ydUxlYRDmZJAVU2R5IhN2enn74ioH+5U/YOawMoEMYeDiFICJzGBibLhst+uBM+eMxInh 0x2COOIrDARXcq5rygycfn5Lw/KVO47e9dF6fHbPU7tM+emLLzodEWSsszsw6by4pp3owWNc+gc vhOnw+/NOtN3oG3U0xOYCf/+zuheX1Z5fW63OoLRyHa+NZYYpAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D 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 Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 158 ++++++++++++-----= ---- 1 file changed, 92 insertions(+), 66 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/g= pu/drm/tests/drm_hdmi_state_helper_test.c index e97efd3af9ed18e6cf8ee66b4923dfc805b34e19..7ffd666753b10bc991894e23820= 6a3c5328d0e23 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -53,53 +53,10 @@ static struct drm_display_mode *find_preferred_mode(str= uct drm_connector *connec mutex_unlock(&drm->mode_config.mutex); =20 return preferred; } =20 -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 =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); - -retry: - conn_state =3D drm_atomic_get_connector_state(state, connector); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); - - ret =3D drm_atomic_set_crtc_for_connector(conn_state, crtc); - if (ret =3D=3D -EDEADLK) { - drm_atomic_state_clear(state); - ret =3D drm_modeset_backoff(ctx); - if (!ret) - goto retry; - } - KUNIT_EXPECT_EQ(test, ret, 0); - - crtc_state =3D drm_atomic_get_crtc_state(state, crtc); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); - - ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); - KUNIT_EXPECT_EQ(test, ret, 0); - - crtc_state->enable =3D true; - crtc_state->active =3D true; - - ret =3D drm_atomic_commit(state); - KUNIT_ASSERT_EQ(test, ret, 0); - - return 0; -} - static int set_connector_edid(struct kunit *test, struct drm_connector *co= nnector, const char *edid, size_t edid_len) { struct drm_atomic_helper_connector_hdmi_priv *priv =3D connector_to_priv(connector); @@ -296,11 +253,14 @@ static void drm_test_check_broadcast_rgb_crtc_mode_ch= anged(struct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -362,11 +322,14 @@ static void drm_test_check_broadcast_rgb_crtc_mode_no= t_changed(struct kunit *tes preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -430,11 +393,14 @@ static void drm_test_check_broadcast_rgb_auto_cea_mod= e(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -487,11 +453,14 @@ static void drm_test_check_broadcast_rgb_auto_cea_mod= e_vic_1(struct kunit *test) =20 mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -545,11 +514,14 @@ static void drm_test_check_broadcast_rgb_full_cea_mod= e(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -604,11 +576,14 @@ static void drm_test_check_broadcast_rgb_full_cea_mod= e_vic_1(struct kunit *test) =20 mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -664,11 +639,14 @@ static void drm_test_check_broadcast_rgb_limited_cea_= mode(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -723,11 +701,14 @@ static void drm_test_check_broadcast_rgb_limited_cea_= mode_vic_1(struct kunit *te =20 mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -787,11 +768,14 @@ static void drm_test_check_output_bpc_crtc_mode_chang= ed(struct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -863,11 +847,14 @@ static void drm_test_check_output_bpc_crtc_mode_not_c= hanged(struct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 @@ -939,11 +926,14 @@ static void drm_test_check_output_bpc_dvi(struct kuni= t *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -986,11 +976,14 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(st= ruct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1035,11 +1028,14 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc= (struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1084,11 +1080,14 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc= (struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1132,11 +1131,14 @@ static void drm_test_check_hdmi_funcs_reject_rate(s= truct kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 /* You shouldn't be doing that at home. */ conn->hdmi.funcs =3D &reject_connector_hdmi_funcs; =20 @@ -1206,11 +1208,14 @@ static void drm_test_check_max_tmds_rate_bpc_fallba= ck(struct kunit *test) rate =3D drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1280,11 +1285,14 @@ static void drm_test_check_max_tmds_rate_format_fal= lback(struct kunit *test) rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1345,11 +1353,14 @@ static void drm_test_check_output_bpc_format_vic_1(= struct kunit *test) KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, mode, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + mode, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1412,11 +1423,14 @@ static void drm_test_check_output_bpc_format_driver= _rgb_only(struct kunit *test) rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1481,11 +1495,14 @@ static void drm_test_check_output_bpc_format_displa= y_rgb_only(struct kunit *test rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1541,11 +1558,14 @@ static void drm_test_check_output_bpc_format_driver= _8bpc_only(struct kunit *test rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1603,11 +1623,14 @@ static void drm_test_check_output_bpc_format_displa= y_8bpc_only(struct kunit *tes rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 drm_modeset_acquire_init(&ctx, 0); =20 - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); =20 @@ -1643,11 +1666,14 @@ static void drm_test_check_disable_connector(struct= kunit *test) preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 drm =3D &priv->drm; crtc =3D priv->crtc; - ret =3D light_up_connector(test, drm, crtc, conn, preferred, &ctx); + ret =3D drm_kunit_helper_enable_crtc_connector(test, drm, + crtc, conn, + preferred, + &ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, &ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 --=20 2.48.1