From patchwork Mon Nov 7 14:16:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13034415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8CDE3C433FE for ; Mon, 7 Nov 2022 14:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PK1/peWOVqJ4+Ic10TG5KzNsoytcrUp8Ps2VXY5QYMQ=; b=mCB1hbL0BGM6Em Ktun7ZZIgCmeJ5TanpAdpKS+FlEwY1yjqe+Z+vVx/CaD9ENXBVsZvDV5FlhZtZsxsvz22QMpdN0nO WMuC9Yi86VzqAN81/3VxlTflaly6WqDkGJ7TplQtd6TVK5YiYF03CE+lCAjbpqE4maDMWcIW+dN35 fZA9MERlUtAG2mr7jA17K9VsPWSrJkngySNhHY2aTf/I5e/uV2scJN6XolSEmj6YKl36kOMux2Fq5 KfznlFdmBazTAsa9t1gX4c/wKO7zgnRb0KBOIFbFBhimYTXSgJr5NN6yjKe64AHuDdR/b8ZOY4hoU Yh3JFr8dibZ4RG6CMFZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1os2zF-00FBkl-GC; Mon, 07 Nov 2022 14:20:29 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1os2w7-00F9sT-F8 for linux-arm-kernel@lists.infradead.org; Mon, 07 Nov 2022 14:17:17 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.west.internal (Postfix) with ESMTP id CFBBC2B05E60; Mon, 7 Nov 2022 09:17:12 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 07 Nov 2022 09:17:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1667830632; x= 1667837832; bh=1h4TCrj1z3lWEm8iQnLyRcL0Z+cpT6qrzQI0Jw1SDUw=; b=G pfwZ26QPNBYWrAtr3NnyUvLtZdQPgZvk5pruT7CTGBlgZAu//OmTA7repEn6c+xT UxGQXwNXph/pDX3Yo+faVEoA2TdaJ3+ObFzAsdcdQbJkUUn4YdSJx7YXKLyAtpTL oi62bUJzezJrZPb8oz2lm4TxIXdvlhIkQFv/OQqrnZ5bKk9mSQZN9nXwf5SRWPD1 0GM1bQejRjPkqov3L6fPrP1Qkn86S9hrLFKd6X2WVkjRj4QWH7Xeqr2OZ401mgUJ enTKHZkVF4GZ3CmHUe40zbgqlTlAfEJCjHKvgA4x7CDqknEFMjvk0r2sP40AKBKZ LFG+OvDGYcuLdWMC+ci0Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1667830632; x= 1667837832; bh=1h4TCrj1z3lWEm8iQnLyRcL0Z+cpT6qrzQI0Jw1SDUw=; b=r iI5nPajPHK0XEysFCj9SX3fi4ZDLdp+VZQLl7vjfFJmXlXaPci6TlLj4PxytjI7C aVVcGvrF34LZtIwNBkqrsYjvZtoU3qhsLBGRZTBv3rav60/3In1T/gXSnDpLhTrF Ct4G5U7SIL4vqM4/evrxjRPWzzqcYjN5TzhK+yVxpgW7rDvHgxLesetAWNzGAbVN ZFetxhnVhVOgaanwdpqQOJfqDoCEP+IBrpPeEdQULBJX91KyZmiU+XE63BXkRULJ vSiK8zysIrIGqe0N4oI84hQlecTTlB7OWBo0dZBKIezpxdon5mDuKe0uxNUGtct6 nNt9hwIJCz9FxeIpjFo3w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:11 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:33 +0100 Subject: [PATCH v7 07/23] drm/client: Add some tests for drm_connector_pick_cmdline_mode() MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v7-7-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie Cc: =?unknown-8bit?q?Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_Maxime_Ri?= =?unknown-8bit?q?pard_=3Cmaxime=40cerno=2Etech=3E=2C_Hans_de_Goede_=3Chdego?= =?unknown-8bit?q?ede=40redhat=2Ecom=3E=2C?= =?unknown-8bit?q?_linux-sunxi=40lists=2Elinux=2Edev=2C_linux-kernel=40vger?= =?unknown-8bit?q?=2Ekernel=2Eorg=2C_Geert_Uytterhoeven_=3Cgeert=40linux-m68?= =?unknown-8bit?q?k=2Eorg=3E=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-arm-kernel=40lists=2Einfradead=2Eorg=2C_Dom_Cobl?= =?unknown-8bit?q?ey_=3Cdom=40raspberrypi=2Ecom=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_dri-devel=40lists=2Efreedesktop=2Eorg=2C_intel-gfx=40l?= =?unknown-8bit?q?ists=2Efreedesktop=2Eorg=2C?= =?unknown-8bit?q?_nouveau=40lists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes?= =?unknown-8bit?q?_=3Cnoralf=40tronnes=2Eorg=3E?= X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=4598; i=maxime@cerno.tech; h=from:subject:message-id; bh=JSdl03pNPXRu6KeMwvw89CgZpMyZ0zShUDVNllkztEg=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwvYSDv4qJ9rlJlhMvTz7ovtLu7mZZ1VCW+a0Wr6vfK2v y2HVUcrCIMbFICumyBIjbL4k7tSs151sfPNg5rAygQxh4OIUgIl0WjL84a/6Y+Ww3eCPunHq8akqjA ubXnUndERfV5/klXFRjnXfXkaG7W5Tni+72uxno1zp8X2d+CoRw0JGcZ34cqXmcyf7bJfzAgA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221107_061715_573618_C010CF1D X-CRM114-Status: GOOD ( 15.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org drm_connector_pick_cmdline_mode() is in charge of finding a proper drm_display_mode from the definition we got in the video= command line argument. Let's add some unit tests to make sure we're not getting any regressions there. Acked-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v6: - Rename tests to be consistent with DRM tests naming convention Changes in v5: - Removed useless (for now) count and modes intermediate variables in get_modes - Switched to kunit assertions in test init, and to KUNIT_ASSERT_NOT_NULL instead of KUNIT_ASSERT_PTR_NE(..., NULL) Changes in v4: - Removed MODULE macros --- drivers/gpu/drm/drm_client_modeset.c | 4 + drivers/gpu/drm/tests/drm_client_modeset_test.c | 100 ++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c index bbc535cc50dd..d553e793e673 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -1237,3 +1237,7 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode) return ret; } EXPORT_SYMBOL(drm_client_modeset_dpms); + +#ifdef CONFIG_DRM_KUNIT_TEST +#include "tests/drm_client_modeset_test.c" +#endif diff --git a/drivers/gpu/drm/tests/drm_client_modeset_test.c b/drivers/gpu/drm/tests/drm_client_modeset_test.c new file mode 100644 index 000000000000..3aa1acfe75df --- /dev/null +++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c @@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Maxime Ripard + */ + +#include + +#include +#include +#include +#include +#include +#include + +#include "drm_kunit_helpers.h" + +struct drm_client_modeset_test_priv { + struct drm_device *drm; + struct drm_connector connector; +}; + +static int drm_client_modeset_connector_get_modes(struct drm_connector *connector) +{ + return drm_add_modes_noedid(connector, 1920, 1200); +} + +static const struct drm_connector_helper_funcs drm_client_modeset_connector_helper_funcs = { + .get_modes = drm_client_modeset_connector_get_modes, +}; + +static const struct drm_connector_funcs drm_client_modeset_connector_funcs = { +}; + +static int drm_client_modeset_test_init(struct kunit *test) +{ + struct drm_client_modeset_test_priv *priv; + int ret; + + priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, priv); + + test->priv = priv; + + priv->drm = drm_kunit_device_init(test, "drm-client-modeset-test"); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm); + + ret = drmm_connector_init(priv->drm, &priv->connector, + &drm_client_modeset_connector_funcs, + DRM_MODE_CONNECTOR_Unknown, + NULL); + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_connector_helper_add(&priv->connector, &drm_client_modeset_connector_helper_funcs); + + return 0; + +} + +static void drm_test_pick_cmdline_res_1920_1080_60(struct kunit *test) +{ + struct drm_client_modeset_test_priv *priv = test->priv; + struct drm_device *drm = priv->drm; + struct drm_connector *connector = &priv->connector; + struct drm_cmdline_mode *cmdline_mode = &connector->cmdline_mode; + struct drm_display_mode *expected_mode, *mode; + const char *cmdline = "1920x1080@60"; + int ret; + + expected_mode = drm_mode_find_dmt(priv->drm, 1920, 1080, 60, false); + KUNIT_ASSERT_NOT_NULL(test, expected_mode); + + KUNIT_ASSERT_TRUE(test, + drm_mode_parse_command_line_for_connector(cmdline, + connector, + cmdline_mode)); + + mutex_lock(&drm->mode_config.mutex); + ret = drm_helper_probe_single_connector_modes(connector, 1920, 1080); + mutex_unlock(&drm->mode_config.mutex); + KUNIT_ASSERT_GT(test, ret, 0); + + mode = drm_connector_pick_cmdline_mode(connector); + KUNIT_ASSERT_NOT_NULL(test, mode); + + KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode)); +} + + +static struct kunit_case drm_test_pick_cmdline_tests[] = { + KUNIT_CASE(drm_test_pick_cmdline_res_1920_1080_60), + {} +}; + +static struct kunit_suite drm_test_pick_cmdline_test_suite = { + .name = "drm_test_pick_cmdline", + .init = drm_client_modeset_test_init, + .test_cases = drm_test_pick_cmdline_tests +}; + +kunit_test_suite(drm_test_pick_cmdline_test_suite);