From patchwork Thu Jul 23 01:35:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 2789 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10]) by mxe881.netcup.net (Postfix) with ESMTPS id 01C921C3E03 for ; Thu, 23 Jul 2026 03:52:15 +0200 (CEST) Authentication-Results: mxe881; dkim=pass header.d=collabora.com; spf=pass (sender IP is 172.234.253.10) smtp.mailfrom=linux-sunxi+bounces-24693-noreply=patchwork.local@lists.linux.dev smtp.helo=sea.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.234.253.10 as permitted sender) client-ip=172.234.253.10; envelope-from=linux-sunxi+bounces-24693-noreply=patchwork.local@lists.linux.dev; helo=sea.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by sea.lore.kernel.org (Postfix) with ESMTP id F3F6830D1CA6 for ; Thu, 23 Jul 2026 01:39:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 55C8837E5C2; Thu, 23 Jul 2026 01:35:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="T9/OeIOM" 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 0300530ACFB for ; Thu, 23 Jul 2026 01:35:39 +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=1784770543; cv=none; b=oBjb0k/v4sBHz5MrsTB4hX9izbKjBDcJTS8jZmLD9BoL6h7mrs1kREG+YtCTxvZWI8fCuhKIC6r+w5/C52Lh1ZpNaqVoW63hlEfvM2GSeo+q4iBC/fQjCdakOR2KHy40iarGdhfGtqDWrp27PvhNR3/AJ/7HWWUI7jPDEUSYydQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784770543; c=relaxed/simple; bh=yBg0SDMZyXg+pIXTPDE0FDwxGb2A6MLKmAesimj8YhQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pmNYaWZU3rYp3slKmTtFRePQOCyEHiWLvQp2cGRFo0GITagraKUhQ1lvrMItyQU4NJd1x9QkTSgHt3Mi5x/aSIVTCEnun+HWxkziSRh5AL2/x0KVHfjTOQLxOXXU6ySe0yByOOMGYlNCrzHA5Aqv3krwMP2nwdc8WnD46D2QKc0= 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=T9/OeIOM; 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=1784770538; bh=yBg0SDMZyXg+pIXTPDE0FDwxGb2A6MLKmAesimj8YhQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=T9/OeIOMqESMC4RQwPaCtxs38oFcCcN0ZoJ4hu+MhAJBIKjn7NxNtaPzRaBMZHFT8 /JSJq7u24fELDmrvYz0lJ57OutsojRYWcu++/joRIMlxZihTgTDAWk2XiPQRSKRZpM Th6JzoV/lng8qXAz5rKvKN/aef3dlPBmaDttEEWidIrsVPQUGkoBkCAv0xXEc5xRXc Tm1OD2g0w2Wc0MKj29hx5GCPMP0+kDohSyJ/Kq2T5v0hizhshuVJyiPIQKBwJTQ24n L4h1CUb6xSQXL4lLSi40MjQgMXY36j4qPRjDsaSbzwQ2WbtJLTSvjNBgE8SpiJj0L6 nIHCRBP7cdUCw== 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 3F45217E0F76; Thu, 23 Jul 2026 03:35:38 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 23 Jul 2026 04:35:41 +0300 Subject: [PATCH v9 52/61] 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: <20260723-dw-hdmi-qp-scramb-v9-52-4fb12ea22ac9@collabora.com> References: <20260723-dw-hdmi-qp-scramb-v9-0-4fb12ea22ac9@collabora.com> In-Reply-To: <20260723-dw-hdmi-qp-scramb-v9-0-4fb12ea22ac9@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.234.253.10:from]; SUSPICIOUS_RECIPS(1.50)[]; MAILLIST(-0.15)[generic]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; HAS_LIST_UNSUB(-0.01)[]; R_DKIM_ALLOW(0.00)[collabora.com:s=mail]; PRECEDENCE_BULK(0.00)[]; TAGGED_RCPT(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sea.lore.kernel.org:rdns,sea.lore.kernel.org:helo,collabora.com:email,collabora.com:dkim]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_TWELVE(0.00)[30]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; FROM_NEQ_ENVFROM(0.00)[cristian.ciocaltea@collabora.com,linux-sunxi@lists.linux.dev]; DMARC_POLICY_ALLOW(0.00)[collabora.com,none]; 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]; DKIM_TRACE(0.00)[collabora.com:+]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:172.234.253.10:c]; FORGED_SENDER_MAILLIST(0.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; MIME_TRACE(0.00)[0:+]; TAGGED_FROM(0.00)[bounces-24693-noreply=patchwork.local]; ASN(0.00)[asn:63949, ipnet:172.234.224.0/19, country:SG]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 01C921C3E03 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. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/tests/drm_connector_test.c | 243 +++++++++++++---------------- 1 file changed, 111 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..74342880b301 100644 --- a/drivers/gpu/drm/tests/drm_connector_test.c +++ b/drivers/gpu/drm/tests/drm_connector_test.c @@ -37,6 +37,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 +674,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 +691,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); } @@ -707,16 +706,16 @@ static void drm_test_connector_hdmi_init_null_ddc(struct kunit *test) static void drm_test_connector_hdmi_init_null_vendor(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - NULL, "Product", + hdmi_funcs.vendor = NULL; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -727,16 +726,16 @@ static void drm_test_connector_hdmi_init_null_vendor(struct kunit *test) static void drm_test_connector_hdmi_init_null_product(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", NULL, + hdmi_funcs.product = NULL; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +749,18 @@ 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"; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - KUNIT_ASSERT_LT(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + hdmi_funcs.product = "Prod"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", product_name, + KUNIT_ASSERT_LT(test, strlen(hdmi_funcs.product), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +781,18 @@ 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"; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - KUNIT_ASSERT_EQ(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + hdmi_funcs.product = "ProductProductPr"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", product_name, + KUNIT_ASSERT_EQ(test, strlen(hdmi_funcs.product), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +807,18 @@ 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"; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - KUNIT_ASSERT_GT(test, strlen(product_name), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + hdmi_funcs.product = "ProductProductProduct"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", product_name, + KUNIT_ASSERT_GT(test, strlen(hdmi_funcs.product), DRM_CONNECTOR_HDMI_PRODUCT_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +832,18 @@ 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"; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - KUNIT_ASSERT_LT(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN); + hdmi_funcs.vendor = "Vend"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - vendor_name, "Product", + KUNIT_ASSERT_LT(test, strlen(hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +863,18 @@ 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"; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - KUNIT_ASSERT_EQ(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN); + hdmi_funcs.vendor = "VendorVe"; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - vendor_name, "Product", + KUNIT_ASSERT_EQ(test, strlen(hdmi_funcs.vendor), DRM_CONNECTOR_HDMI_VENDOR_LEN); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +889,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"; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - KUNIT_ASSERT_GT(test, strlen(vendor_name), DRM_CONNECTOR_HDMI_VENDOR_LEN); + hdmi_funcs.vendor = "VendorVendor"; + KUNIT_ASSERT_GT(test, strlen(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, + &hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -918,16 +910,16 @@ static void drm_test_connector_hdmi_init_vendor_length_too_long(struct kunit *te static void drm_test_connector_hdmi_init_bpc_invalid(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + hdmi_funcs.max_bpc = 9; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444), - 9); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -938,16 +930,16 @@ static void drm_test_connector_hdmi_init_bpc_invalid(struct kunit *test) static void drm_test_connector_hdmi_init_bpc_null(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + hdmi_funcs.max_bpc = 0; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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 +957,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; @@ -1001,19 +990,19 @@ static void drm_test_connector_hdmi_init_bpc_10(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; struct drm_connector_state *state; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; struct drm_connector *connector = &priv->connector; struct drm_property *prop; uint64_t val; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, connector, - "Vendor", "Product", + hdmi_funcs.max_bpc = 10; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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; @@ -1042,19 +1031,19 @@ static void drm_test_connector_hdmi_init_bpc_12(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; struct drm_connector_state *state; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; struct drm_connector *connector = &priv->connector; struct drm_property *prop; uint64_t val; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, connector, - "Vendor", "Product", + hdmi_funcs.max_bpc = 12; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &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; @@ -1081,16 +1070,16 @@ static void drm_test_connector_hdmi_init_bpc_12(struct kunit *test) static void drm_test_connector_hdmi_init_formats_empty(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + hdmi_funcs.supported_formats = 0; + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - 0, - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -1101,16 +1090,16 @@ static void drm_test_connector_hdmi_init_formats_empty(struct kunit *test) static void drm_test_connector_hdmi_init_formats_no_rgb(struct kunit *test) { struct drm_connector_init_priv *priv = test->priv; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; int ret; - ret = drmm_connector_hdmi_ini2(&priv->drm, &priv->connector, - "Vendor", "Product", + hdmi_funcs.supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422); + + ret = drmm_connector_hdmi_init(&priv->drm, &priv->connector, &dummy_funcs, - &dummy_hdmi_funcs, + &hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422), - 8); + &priv->ddc); KUNIT_EXPECT_LT(test, ret, 0); } @@ -1155,20 +1144,19 @@ KUNIT_ARRAY_PARAM(drm_connector_hdmi_init_formats_yuv420_allowed, static void drm_test_connector_hdmi_init_formats_yuv420_allowed(struct kunit *test) { const struct drm_connector_hdmi_init_formats_yuv420_allowed_test *params; + struct drm_connector_hdmi_funcs hdmi_funcs = dummy_hdmi_funcs; struct drm_connector_init_priv *priv = test->priv; int ret; params = test->param_value; priv->connector.ycbcr_420_allowed = params->yuv420_allowed; + hdmi_funcs.supported_formats = params->supported_formats; - 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, + &hdmi_funcs, DRM_MODE_CONNECTOR_HDMIA, - &priv->ddc, - params->supported_formats, - 8); + &priv->ddc); KUNIT_EXPECT_EQ(test, ret, params->expected_result); } @@ -1182,14 +1170,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 +1202,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 +1476,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);