From mboxrd@z Thu Jan 1 00:00:00 1970 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 5CF4841D787 for ; Thu, 2 Jul 2026 14:46:58 +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=1783003620; cv=none; b=A62I0WbV6/QvoOR485763qmTAzWcr6PeMxN2gsEQarkUPb3KIAkMC8QMFnVp5sFWUXb5D0ck5e7A6SLhYOLs++imjmNe67/C+VcXbypLh6eBMkzLNkWH8FS8/3QPlE4oLE1CQ3bMcyS3ij2gmxn/pKTKXdgpLyZnxYwkOYHN+j0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783003620; c=relaxed/simple; bh=PuxG68+CQhAoYovAeuQMsuFGzjG8Iw5optkXYeXFq4s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JuFPUSStyO9lr9HaQNEdqnWfkk2deuGV8eG72Ny6skQL8HCHQJhNc9EtZMZkGkdV9F7kFOmjnButqZ9WttiWSK/XGQpi1ko8pMjJWaPxK8FYw8oLUTQOcd/5udVPXnxbHZ71ES6H5RvF9bFO106ekFF9bxGTBIlUVUQ/m4snoMQ= 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=OxkSnueS; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="OxkSnueS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1783003617; bh=PuxG68+CQhAoYovAeuQMsuFGzjG8Iw5optkXYeXFq4s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OxkSnueSEO0v+///ZqYtgTpupt6OfvoWhQaCKAJsrnLTEDJOtCB/cgKvg7OtaTfzD y0j0zXwvnNlNixcO2VSzTJmM13Zv0iAOZKa1f7s4HkmEVkYBvINZZlSgP7NYw2J2QQ IwUDzGEN27PR/3hnChZxMogVb1kqo4QMTtrGbgtP/AE3ZKB9yZ3aVQa6OgZDN7TImW xtZJNm4LElVLEb0vY2h+2lElx/0PJWACgnQsKYkTm/Zb02mUr8DkpXY+bHjGDiZ3nP y7d64Cuec7QFBw3GLKVrq9pMKyhu39BWMxDh8eiK/RBOyV8oLZcPidf0rg9GxNMzou QrssWl9sKahxA== Received: from localhost (unknown [100.64.0.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id CDA0C17E3678; Thu, 2 Jul 2026 16:46:56 +0200 (CEST) From: Cristian Ciocaltea Date: Thu, 02 Jul 2026 17:46:47 +0300 Subject: [PATCH v8 34/39] drm/tests: hdmi_state_helper: Use drmm_connector_hdmi_init_with_caps() 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: 7bit Message-Id: <20260702-dw-hdmi-qp-scramb-v8-34-d79890d00b6a@collabora.com> References: <20260702-dw-hdmi-qp-scramb-v8-0-d79890d00b6a@collabora.com> In-Reply-To: <20260702-dw-hdmi-qp-scramb-v8-0-d79890d00b6a@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Daniel Stone , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org X-Mailer: b4 0.15.2 Convert the internal __connector_hdmi_init() helper to take a drm_connector_hdmi_caps struct rather than separate formats and max_bpc parameters, and add a drm_kunit_helper_connector_hdmi_init_with_caps_edid_funcs() macro that exposes the full caps struct to tests. This lets new tests exercise capability fields beyond formats and max_bpc, notably supported_hdmi_ver and max_tmds_char_rate, without further changes to the helper signature. The legacy drm_kunit_helper_connector_hdmi_init_with_edid_funcs() macro is kept as a thin wrapper so the bulk of the test suite is unaffected. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 35 ++++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) 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 353a261d42da..6a7dd2de002a 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -231,8 +231,7 @@ static const struct drm_encoder_helper_funcs test_encoder_helper_funcs = { static struct drm_atomic_helper_connector_hdmi_priv * __connector_hdmi_init(struct kunit *test, - unsigned int formats, - unsigned int max_bpc, + const struct drm_connector_hdmi_caps *caps, const struct drm_connector_hdmi_funcs *hdmi_funcs, const void *edid_data, size_t edid_len) { @@ -273,16 +272,16 @@ __connector_hdmi_init(struct kunit *test, enc->possible_crtcs = drm_crtc_mask(priv->crtc); conn = &priv->connector; - conn->ycbcr_420_allowed = !!(formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)); + conn->ycbcr_420_allowed = !!(caps->supported_formats & + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)); - ret = drmm_connector_hdmi_init(drm, conn, - "Vendor", "Product", - &dummy_connector_funcs, - hdmi_funcs, - DRM_MODE_CONNECTOR_HDMIA, - NULL, - formats, - max_bpc); + ret = drmm_connector_hdmi_init_with_caps(drm, conn, + "Vendor", "Product", + &dummy_connector_funcs, + hdmi_funcs, + DRM_MODE_CONNECTOR_HDMIA, + NULL, + caps); KUNIT_ASSERT_EQ(test, ret, 0); drm_connector_helper_add(conn, &dummy_connector_helper_funcs); @@ -298,8 +297,18 @@ __connector_hdmi_init(struct kunit *test, return priv; } -#define drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, formats, max_bpc, funcs, edid) \ - __connector_hdmi_init(test, formats, max_bpc, funcs, edid, ARRAY_SIZE(edid)) +#define drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, formats, \ + bpc_max, funcs, edid) \ +({ \ + struct drm_connector_hdmi_caps __caps = { \ + .supported_formats = (formats), \ + .max_bpc = (bpc_max), \ + }; \ + __connector_hdmi_init(test, &__caps, funcs, edid, ARRAY_SIZE(edid)); \ +}) + +#define drm_kunit_helper_connector_hdmi_init_with_caps_edid_funcs(test, caps, funcs, edid) \ + __connector_hdmi_init(test, caps, funcs, edid, ARRAY_SIZE(edid)) static struct drm_atomic_helper_connector_hdmi_priv * -- 2.54.0