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 6380C1C6FFD for ; Tue, 11 Mar 2025 22:44:30 +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=1741733072; cv=none; b=ca/wooYJb6YmaLDkG7bgbzdxzmlojQfIVQC71bcxzjTUAviRt4bEGk+GVDwiMTNkL+rDw5qKASQXjNUc8C09Ih7pN0cL2+imewDDY14GUv+7m//qbgwtnccy/zSLhm8bmoKwxXUK2o+72RpHUN9oixa6s7IxrTgWeHmwdHBIWS0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741733072; c=relaxed/simple; bh=rumNZz+nbkwUqosYZDH87JxuURktvLmlm42+WewyqgY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=aAlYkZ07HLp8qUQmslPDPzLvFBXzY4gwcqDXoe3knCeWThGOXiYkRTIxq+lMpmh2ol6TV37d3JGLK7KfoUTZd9iDeiwEmz5hW2wvF9PgPkTrHDVMM9VLbRVuuj4RISJSmWWx9ztjgb0Nnmjtlwb7lUzBSA+MOdaDC4WTQq5khxU= 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=n8VvlI74; 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="n8VvlI74" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1741733068; bh=rumNZz+nbkwUqosYZDH87JxuURktvLmlm42+WewyqgY=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=n8VvlI74ynV7LINmJ/MoFt1sEtTI7kVyUkKfbM+3UymvHUsVo+WKA4NsPMLeSR2sM yUt2/CMSfz37R1DVNDnfBuSIjGZjULzFdD19ooFCUVBN51/hjaO0lKZy2+NzL/sQYg YHTu3A6YeGqPL8Dp7sbBvLMiH1CcfYrbKyhy7t+aSc3HEjcfhZ1x7v6bfb1ydCR/tD TY9MytIcq2CggJZHJfpqIU/EthcMllPvwhj9nYsAqOjcuGil1JRET2V9WDyrAvKHiB Sw7AZ47Me685rJs/MqylE+MCSOPKYVeA33ZHfEzT3ZmHUtwXFIGCwkQkztqM4myq5o IX3LoGxq2P4dA== Received: from [192.168.1.90] (unknown [84.232.140.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id BF68817E0B25; Tue, 11 Mar 2025 23:44:27 +0100 (CET) Message-ID: Date: Wed, 12 Mar 2025 00:44:26 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 5/7] drm/tests: hdmi: Add macros to simplify EDID setup To: Maxime Ripard Cc: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Stevenson , Dmitry Baryshkov , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20250311-hdmi-conn-yuv-v2-0-fbdb94f02562@collabora.com> <20250311-hdmi-conn-yuv-v2-5-fbdb94f02562@collabora.com> <20250311-spiritual-hornet-of-prestige-ef4132@houat> From: Cristian Ciocaltea Content-Language: en-US In-Reply-To: <20250311-spiritual-hornet-of-prestige-ef4132@houat> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/11/25 6:12 PM, Maxime Ripard wrote: > On Tue, Mar 11, 2025 at 12:57:37PM +0200, Cristian Ciocaltea wrote: >> Introduce a few macros to facilitate setting custom (i.e. non-default) >> EDID data during connector initialization. >> >> This helps reducing boilerplate code while also drops some redundant >> calls to set_connector_edid(). >> >> Signed-off-by: Cristian Ciocaltea >> --- >> drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 245 ++++++++------------- >> 1 file changed, 93 insertions(+), 152 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 e97efd3af9ed18e6cf8ee66b4923dfc805b34e19..a3f7f3ce31c73335c2c2643bdc5395b6ceb6f071 100644 >> --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c >> +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c >> @@ -183,10 +183,12 @@ static const struct drm_connector_funcs dummy_connector_funcs = { >> >> static >> struct drm_atomic_helper_connector_hdmi_priv * >> -drm_kunit_helper_connector_hdmi_init_funcs(struct kunit *test, >> - unsigned int formats, >> - unsigned int max_bpc, >> - const struct drm_connector_hdmi_funcs *hdmi_funcs) >> +connector_hdmi_init_funcs_set_edid(struct kunit *test, >> + unsigned int formats, >> + unsigned int max_bpc, >> + const struct drm_connector_hdmi_funcs *hdmi_funcs, >> + const char *edid_data, >> + size_t edid_len) >> { >> struct drm_atomic_helper_connector_hdmi_priv *priv; >> struct drm_connector *conn; >> @@ -240,30 +242,27 @@ drm_kunit_helper_connector_hdmi_init_funcs(struct kunit *test, >> >> drm_mode_config_reset(drm); >> >> + if (edid_data && edid_len) { >> + ret = set_connector_edid(test, &priv->connector, edid_data, edid_len); >> + KUNIT_ASSERT_GT(test, ret, 0); >> + } >> + >> return priv; >> } >> >> -static >> -struct drm_atomic_helper_connector_hdmi_priv * >> -drm_kunit_helper_connector_hdmi_init(struct kunit *test, >> - unsigned int formats, >> - unsigned int max_bpc) >> -{ >> - struct drm_atomic_helper_connector_hdmi_priv *priv; >> - int ret; >> +#define drm_kunit_helper_connector_hdmi_init_funcs_set_edid(test, formats, max_bpc, funcs, edid) \ >> + connector_hdmi_init_funcs_set_edid(test, formats, max_bpc, funcs, edid, ARRAY_SIZE(edid)) >> >> - priv = drm_kunit_helper_connector_hdmi_init_funcs(test, >> - formats, max_bpc, >> - &dummy_connector_hdmi_funcs); >> - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); >> +#define drm_kunit_helper_connector_hdmi_init_funcs(test, formats, max_bpc, funcs) \ >> + connector_hdmi_init_funcs_set_edid(test, formats, max_bpc, funcs, NULL, 0) >> >> - ret = set_connector_edid(test, &priv->connector, >> - test_edid_hdmi_1080p_rgb_max_200mhz, >> - ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz)); >> - KUNIT_ASSERT_GT(test, ret, 0); >> +#define drm_kunit_helper_connector_hdmi_init_set_edid(test, formats, max_bpc, edid) \ >> + drm_kunit_helper_connector_hdmi_init_funcs_set_edid(test, formats, max_bpc, \ >> + &dummy_connector_hdmi_funcs, edid) >> >> - return priv; >> -} >> +#define drm_kunit_helper_connector_hdmi_init(test, formats, max_bpc) \ >> + drm_kunit_helper_connector_hdmi_init_set_edid(test, formats, max_bpc, \ >> + test_edid_hdmi_1080p_rgb_max_200mhz) > > I'd really prefer to have functions to macros here. They are easier to > read, extend, and don't have any particular drawbacks. Yeah, the main reason I opted for macros was to allow dropping ARRAY_SIZE(edid) from the caller side, hence making the API as simple as possible. > I also don't think we need that many, looking at the tests: > > - We need drm_kunit_helper_connector_hdmi_init() to setup a connector > with test_edid_hdmi_1080p_rgb_max_200mhz and > dummy_connector_hdmi_funcs() Correct. > - We need to create a > drm_kunit_helper_connector_hdmi_init_with_edid_funcs() to pass both > the funcs and edid pointers That's drm_kunit_helper_connector_hdmi_init_funcs_set_edid(), but I can rename it if you prefer - I've just tried to keep the name length under control, as there are already some indentation challenges when calling the helpers. Currently it's only used to implement drm_kunit_helper_connector_hdmi_init_set_edid() by passing &dummy_connector_hdmi_funcs, but there are a few test cases that can benefit of it and help extend the cleanup - will do for v3. drm_kunit_helper_connector_hdmi_init_set_edid() should also stay as it's already being used to drop boilerplate code from a lot of places. > And that's it, right? There's also drm_kunit_helper_connector_hdmi_init_funcs() which has been used for a few times, but it can be further optimized out via drm_kunit_helper_connector_hdmi_init_funcs_set_edid(), so I'll drop it. That means we could end up with just the following: - drm_kunit_helper_connector_hdmi_init() - drm_kunit_helper_connector_hdmi_init_set_edid() - drm_kunit_helper_connector_hdmi_init_funcs_set_edid() >> /* >> * Test that if we change the RGB quantization property to a different >> @@ -771,19 +770,15 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test) >> struct drm_crtc *crtc; >> int ret; >> >> - priv = drm_kunit_helper_connector_hdmi_init(test, >> - BIT(HDMI_COLORSPACE_RGB), >> - 10); >> + priv = drm_kunit_helper_connector_hdmi_init_set_edid(test, >> + BIT(HDMI_COLORSPACE_RGB), >> + 10, >> + test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz); > > I think that convertion should be part of another patch. Ack, will move all conversions to a dedicated patch. Thanks, Cristian