From patchwork Fri Jul 31 16:20:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 2842 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from sto.lore.kernel.org (sto.lore.kernel.org [172.232.135.74]) by mxe881.netcup.net (Postfix) with ESMTPS id ADCA31C20B3 for ; Fri, 31 Jul 2026 18:35:22 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=collabora.com; spf=pass (sender IP is 172.232.135.74) smtp.mailfrom=linux-sunxi+bounces-24871-noreply=patchwork.local@lists.linux.dev smtp.helo=sto.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.232.135.74 as permitted sender) client-ip=172.232.135.74; envelope-from=linux-sunxi+bounces-24871-noreply=patchwork.local@lists.linux.dev; helo=sto.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by sto.lore.kernel.org (Postfix) with ESMTP id 6B7FD30743E8 for ; Fri, 31 Jul 2026 16:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D18AA46D2DD; Fri, 31 Jul 2026 16:20:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="pV7jxqqV" X-Original-To: linux-sunxi@lists.linux.dev Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 4242F46AA97 for ; Fri, 31 Jul 2026 16:20:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785514814; cv=none; b=LkH08BJSxgoIYShQ4thuFBzraN3RW6cI551yatYkFR55PCmWE6S8xcrZQHpXPcYfr+gtIAMyHQ2OtfCx21de9vGD2fDbqSMgfI1FDXA2K6m0dM/9kbFCB2NPmub+QKSq00pFMWqIiDxfg6Y6bG316w9/yyOyzNYq9K9VSYqJ3J0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785514814; c=relaxed/simple; bh=b8b0g0mwg6DkAdX6Utag8Oehr2doi4sirDk5lkqvxCs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ho43S7e2Wl5X88EI0WDxhpJu7J1v81+XeQbtWb8Yiu518RFw5rtJpx+Pej/NN8qF55tQGZ7ytz+19XXzoM9YmYZqr6IeMGoNujTiHDZ3GoEcZ8TcuRGQyE0FKD3r7I+oKnDsKEDObrONXciPBvc1EqXYIWMn0Ys//OtX9W/TWpU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=pV7jxqqV; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1785514797; bh=b8b0g0mwg6DkAdX6Utag8Oehr2doi4sirDk5lkqvxCs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pV7jxqqVl2oaCYn0DF6R5tiW48MSkpXK6SgQ3gB5CmULbdz71JgKzLXx+rLya8IE1 GSRSjMTIEJ83kjXi5plK4YN61xUIhxqvt3noNrF5NNgnNCps0vndkSbMiBHB/cBY/z w0zKlc5qqOexJ0G0/fQQRbiNF6+lY4eKmSvR2URheNu3Wa2D39g8/UbSG1ij+P2w1T XZAGw9DymjNXCtvYJyVH4+WQ2RNd8oZ6eb/Vcw/UPPLsqA/WgU8aL10NM0lEqSslMk ah1GdHGDv3k0nDbb73ukRZg935SPIwwehBorvLO8Z0irUtB4pPqPQv/I8eOfABVQm4 OHEDu2Hhq1FYQ== Received: from localhost (unknown [100.64.0.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange secp256r1 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 626CE17E09A8; Fri, 31 Jul 2026 18:19:57 +0200 (CEST) From: Cristian Ciocaltea Date: Fri, 31 Jul 2026 19:20:07 +0300 Subject: [PATCH v10 60/69] drm/tests: connector: Convert to drmm_connector_hdmi_init() Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20260731-dw-hdmi-qp-scramb-v10-60-294364b2cf15@collabora.com> References: <20260731-dw-hdmi-qp-scramb-v10-0-294364b2cf15@collabora.com> In-Reply-To: <20260731-dw-hdmi-qp-scramb-v10-0-294364b2cf15@collabora.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Chen-Yu Tsai , Samuel Holland , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Algea Cao , Daniel Stone , Liu Ying , Phong LE Cc: kernel@collabora.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-rockchip@lists.infradead.org X-Mailer: b4 0.15.2 X-Rspamd-Server: rspamd-worker-8404 X-Spamd-Result: default: False [-2.16 / 15.00]; BAYES_HAM(-5.50)[100.00%]; RBL_SENDERSCORE(2.00)[172.232.135.74:from]; SUSPICIOUS_RECIPS(1.50)[]; MAILLIST(-0.15)[generic]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_FIVE(0.00)[5]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[30]; PRECEDENCE_BULK(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sto.lore.kernel.org:rdns,sto.lore.kernel.org:helo,collabora.com:email,collabora.com:dkim]; TAGGED_RCPT(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[]; R_DKIM_ALLOW(0.00)[collabora.com:s=mail]; ASN(0.00)[asn:63949, ipnet:172.232.128.0/19, country:SG]; DKIM_TRACE(0.00)[collabora.com:+]; DMARC_POLICY_ALLOW(0.00)[collabora.com,none]; R_SPF_ALLOW(0.00)[+ip4:172.232.135.74:c]; TO_DN_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[cristian.ciocaltea@collabora.com,linux-sunxi@lists.linux.dev]; FREEMAIL_TO(0.00)[intel.com,linaro.org,kernel.org,ideasonboard.com,kwiboo.se,gmail.com,bootlin.com,linux.intel.com,suse.de,ffwll.ch,sholland.org,raspberrypi.com,igalia.com,rock-chips.com,sntech.de,collabora.com,nxp.com,baylibre.com]; MIME_TRACE(0.00)[0:+]; TAGGED_FROM(0.00)[bounces-24871-noreply=patchwork.local]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: ADCA31C20B3 X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Switch tests over to the new drmm_connector_hdmi_init() signature, where the vendor, product, supported_formats and max_bpc values previously passed as arguments are now provided through struct drm_connector_hdmi_funcs. As a consequence, the tests exercising those values can no longer share the static dummy_hdmi_funcs and need a modified copy of their own. Since the connector retains a pointer to it, such a copy must not be placed on the stack, which is gone by the time the DRM-managed actions release the connector. Keep it in struct drm_connector_init_priv instead: it embeds the DRM device and is only freed via managed.final_kfree, i.e. once drm_dev_release() has run all DRM-managed actions, so its lifetime strictly outlives the connector. Note that a kunit_kzalloc() buffer would not be suitable, as KUnit releases its resources in reverse order, hence one allocated by a test would be freed before the DRM device allocated by the suite .init(). Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/tests/drm_connector_test.c | 251 ++++++++++++++--------------- 1 file changed, 119 insertions(+), 132 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_connector_test.c b/drivers/gpu/drm/tests/drm_connector_test.c index 3368aedd4e66..c53ccce21a42 100644 --- a/drivers/gpu/drm/tests/drm_connector_test.c +++ b/drivers/gpu/drm/tests/drm_connector_test.c @@ -23,6 +23,8 @@ struct drm_connector_init_priv { struct drm_device drm; struct drm_connector connector; struct i2c_adapter ddc; + /* Mutable copy of a static instance for test-specific overrides */ + struct drm_connector_hdmi_funcs hdmi_funcs; }; static int accept_infoframe_clear_infoframe(struct drm_connector *connector) @@ -37,6 +39,11 @@ static int accept_infoframe_write_infoframe(struct drm_connector *connector, } static const struct drm_connector_hdmi_funcs dummy_hdmi_funcs = { + .vendor = "Vendor", + .product = "Product", + .supported_hdmi_ver = HDMI_VERSION_1_4, + .supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), + .max_bpc = 8, .avi = { .clear_infoframe = accept_infoframe_clear_infoframe, .write_infoframe = accept_infoframe_write_infoframe, @@ -669,14 +676,11 @@ static void drm_test_connector_hdmi_init_valid(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, &dummy_hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); } @@ -689,14 +693,11 @@ static void drm_test_connector_hdmi_init_null_ddc(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, &dummy_hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - NULL, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + NULL); KUNIT_EXPECT_EQ(test, ret, 0); } @@ -709,14 +710,14 @@ static void drm_test_connector_hdmi_init_null_vendor(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - NULL, "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.vendor = NULL; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -729,14 +730,14 @@ static void drm_test_connector_hdmi_init_null_product(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", NULL, + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.product = NULL; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -750,19 +751,19 @@ static void drm_test_connector_hdmi_init_product_valid(struct kunit *test) const unsigned char expected_product[DRM_CONNECTOR_HDMI_PRODUCT_LEN] = { 'P', 'r', 'o', 'd', }; - const char *product_name = "Prod"; int ret; - KUNIT_ASSERT_LT(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.product = "Prod"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", product_name, + KUNIT_ASSERT_LT(test, strlen(priv->hdmi_funcs.product), + DRM_CONNECTOR_HDMI_PRODUCT_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); KUNIT_EXPECT_MEMEQ(test, priv->connector.hdmi.product, @@ -783,19 +784,19 @@ static void drm_test_connector_hdmi_init_product_length_exact(struct kunit *test 'P', 'r', 'o', 'd', 'u', 'c', 't', 'P', 'r', }; - const char *product_name = "ProductProductPr"; int ret; - KUNIT_ASSERT_EQ(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.product = "ProductProductPr"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", product_name, + KUNIT_ASSERT_EQ(test, strlen(priv->hdmi_funcs.product), + DRM_CONNECTOR_HDMI_PRODUCT_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); KUNIT_EXPECT_MEMEQ(test, priv->connector.hdmi.product, @@ -810,19 +811,19 @@ static void drm_test_connector_hdmi_init_product_length_exact(struct kunit *test static void drm_test_connector_hdmi_init_product_length_too_long(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; - const char *product_name = "ProductProductProduct"; int ret; - KUNIT_ASSERT_GT(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.product = "ProductProductProduct"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", product_name, + KUNIT_ASSERT_GT(test, strlen(priv->hdmi_funcs.product), + DRM_CONNECTOR_HDMI_PRODUCT_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -836,19 +837,19 @@ static void drm_test_connector_hdmi_init_vendor_valid(struct kunit *test) const char expected_vendor[DRM_CONNECTOR_HDMI_VENDOR_LEN] = { 'V', 'e', 'n', 'd', }; - const char *vendor_name = "Vend"; int ret; - KUNIT_ASSERT_LT(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN); + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.vendor = "Vend"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - vendor_name, "Product", + KUNIT_ASSERT_LT(test, strlen(priv->hdmi_funcs.vendor), + DRM_CONNECTOR_HDMI_VENDOR_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); KUNIT_EXPECT_MEMEQ(test, priv->connector.hdmi.vendor, @@ -868,19 +869,19 @@ static void drm_test_connector_hdmi_init_vendor_length_exact(struct kunit *test) 'V', 'e', 'n', 'd', 'o', 'r', 'V', 'e', }; - const char *vendor_name = "VendorVe"; int ret; - KUNIT_ASSERT_EQ(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN); + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.vendor = "VendorVe"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - vendor_name, "Product", + KUNIT_ASSERT_EQ(test, strlen(priv->hdmi_funcs.vendor), + DRM_CONNECTOR_HDMI_VENDOR_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); KUNIT_EXPECT_MEMEQ(test, priv->connector.hdmi.vendor, @@ -895,19 +896,17 @@ static void drm_test_connector_hdmi_init_vendor_length_exact(struct kunit *test) static void drm_test_connector_hdmi_init_vendor_length_too_long(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; - const char *vendor_name = "VendorVendor"; int ret; - KUNIT_ASSERT_GT(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN); + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.vendor = "VendorVendor"; + KUNIT_ASSERT_GT(test, strlen(priv->hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN); - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - vendor_name, "Product", + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -920,14 +919,14 @@ static void drm_test_connector_hdmi_init_bpc_invalid(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.max_bpc = 9; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 9); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -940,14 +939,14 @@ static void drm_test_connector_hdmi_init_bpc_null(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.max_bpc = 0; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 0); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -965,14 +964,11 @@ static void drm_test_connector_hdmi_init_bpc_8(struct kunit *test) uint64_t val; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, connector, - "Vendor", "Product", + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, &dummy_hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); prop = connector->max_bpc_property; @@ -1006,14 +1002,14 @@ static void drm_test_connector_hdmi_init_bpc_10(struct kunit *test) uint64_t val; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.max_bpc = 10; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 10); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); prop = connector->max_bpc_property; @@ -1047,14 +1043,14 @@ static void drm_test_connector_hdmi_init_bpc_12(struct kunit *test) uint64_t val; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.max_bpc = 12; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 12); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); prop = connector->max_bpc_property; @@ -1083,14 +1079,14 @@ static void drm_test_connector_hdmi_init_formats_empty(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.supported_formats = 0; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - 0, - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -1103,14 +1099,14 @@ static void drm_test_connector_hdmi_init_formats_no_rgb(struct kunit *test) struct drm_connector_init_priv *priv = test->priv; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -1161,14 +1157,14 @@ static void drm_test_connector_hdmi_init_formats_yuv420_allowed(struct kunit *te params = test->param_value; priv->connector.ycbcr_420_allowed = params->yuv420_allowed; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + priv->hdmi_funcs = dummy_hdmi_funcs; + priv->hdmi_funcs.supported_formats = params->supported_formats; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &priv->hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - params->supported_formats, - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, params->expected_result); } @@ -1182,14 +1178,11 @@ static void drm_test_connector_hdmi_init_type_valid(struct kunit *test) unsigned int connector_type = *(unsigned int *)test->param_value; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, &dummy_hdmi_funcs, connector_type, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); } @@ -1217,14 +1210,11 @@ static void drm_test_connector_hdmi_init_type_invalid(struct kunit *test) unsigned int connector_type = *(unsigned int *)test->param_value; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, &dummy_hdmi_funcs, connector_type, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -1494,14 +1484,11 @@ static void drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector( struct drm_property *prop; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, connector, - "Vendor", "Product", + ret = drmm_connector_hdmi_init(&priv->drm, connector, &dummy_funcs, &dummy_hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, 0); ret = drm_connector_attach_broadcast_rgb_property(connector);