From patchwork Fri Jul 29 16:35:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12932750 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 6CFE5C00144 for ; Fri, 29 Jul 2022 17:31:38 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2bltvaFVdZvNXB5YJAV3A6PZGpwiIFt7G3YvU6hv0jk=; b=o8Dw/UOMpPMYx0 yExQzDgJbgRaEXsGzI9366VO+dfQZSBpyCd1wEhvhWAxV+Db3J4/03z6DL54IJRR6Fmyq/JDMMi++ MXxZ06gIqnNhvoqBFv5qpyQU0hfOFF2EYlbB+vh9G85K1ybAO1XWRIntwuDtUliSfq+p8YybSwlxS jHEJa6qoxyJBnK1YwvN9N6+EAS3w1A6Tkp4RfL9RZo9c3XqvBQVJxQ1WOBxHwkRbrbNm8GvJ0Bczg PH6hx4Xw72vv/bupppA7IrXXvGUqxeL7nf14aQTiZqjV9B5lRYsxPNDxqPoWMRATfwTWB413f18Au hxiaz9xockpEB4FVBOEA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHToL-008FKY-E5; Fri, 29 Jul 2022 17:30:06 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHSzb-006TCo-9e; Fri, 29 Jul 2022 16:37:40 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id 8CC175809A9; Fri, 29 Jul 2022 12:37:38 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 29 Jul 2022 12:37:38 -0400 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=1659112658; x= 1659119858; bh=dahFAJv+Ivg5IyxmwfwuTFDPDTvRXBMRnObgzXXvrWg=; b=Z fg6NkNZsRQfeTQsJoAUfNAxD626xC2iEE17MY1TN2qIH6z6NJdgDmA6JF8O9aq2R Pa308SPiaNSJSxV4WuSCn7fLiS5mIoxDS2XC4WyYaX4u9kr3KuveMt+4xVygWnIK SszvCcEFJvoFKJeCjP0M+YN9m2Ohv8F6fyifI7XX37mnv+jJTIZ58MA7NqYiJoIr qr6jdzSmQqsJPbr3d7e/nCbH6Gw0A2ekmEPFUOtJVmgB1bwl+xZxF38Ren/tz+Lw xBdekT8CWudOwD+6o6Fvi4Ccb0LwhFY23eLBNocnFupIb7PjgBkDp6CeTySDKhfJ aUMIiOV8dWDhs2BPd1EHA== 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=fm3; t=1659112658; x= 1659119858; bh=dahFAJv+Ivg5IyxmwfwuTFDPDTvRXBMRnObgzXXvrWg=; b=C KR3lrZVUvLDUhnwla/a+u7i0FFfrC0hLANPndAs8KMzhoyZUUgpIvaxlatkny92b fhrUndSOe6oVVdSsYptFm5+RVL0RDS0BHKJtWSp7nRz2+6tvidfq8xh0XJUWKcnv e51WukHM87qOro2Z3vGHInhXSGi9e/K+ZurZqO7QUzuV4lWlagVPvV8Xqz78VS0p 9twQhjMYhgjQpwKCkUvcLZuozzdrmeK5JsQG8uN/PMp3IYNZ9n+ZFR6T7fbWRnh/ 6KqSdQbGq88+br2+liOmZEFLSG7vJccUU32jQjGU5ekhJEKVmUp1yRaHVTMn023H ADI2IQhxyqXOUGkyDKwew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddujedguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtoffgsehtkeertdertdejnecuhfhrohhmpefo rgigihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecugg ftrfgrthhtvghrnhepgfffgfetffduudelhfevieffffduleevgfegkeeutefgffejheel leekjeefhfejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Jul 2022 12:37:37 -0400 (EDT) From: Maxime Ripard To: Jernej Skrabec , Martin Blumenstingl , Chen-Yu Tsai , Philipp Zabel , Jerome Brunet , Samuel Holland , Thomas Zimmermann , Daniel Vetter , Emma Anholt , David Airlie , Maarten Lankhorst , =?utf-8?q?Noralf_Tr?= =?utf-8?q?=C3=B8nnes?= , Kevin Hilman , Neil Armstrong , Maxime Ripard Cc: Maxime Ripard , linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Phil Elwell , Mateusz Kwiatkowski , linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven , Dave Stevenson , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Dom Cobley Subject: [PATCH v1 35/35] drm/modes: Introduce more named modes Date: Fri, 29 Jul 2022 18:35:18 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v1-35-3d53ae722097@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech> References: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech> MIME-Version: 1.0 X-Mailer: b4 0.10.0-dev-49460 X-Developer-Signature: v=1; a=openpgp-sha256; l=3448; i=maxime@cerno.tech; h=from:subject:message-id; bh=J/NOksgTIJ1PfGm5WwgVwisLKziRPmxe67l1cyqSQKs=; b=owGbwMvMwCHc4XzqmfnC7acZT6slMSQ94VG6+vveZQ+efJ8meaPbNiu4rKzUz2zzdtnz3b8illuu 3Uu8o5SFQZiDQVZMkeW64Fs7vrAotwieD5th5rAygQxh4OIUgIlEljEyTNwfKXVnx5qFO45MDLw44+ Sx7Mebrt2dqTexxbf8YsXpySwMfwW/XBNl1u2+HCfPUSjkf6Y+Y0+KFcO63enVpkJdgSd3vgMA 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-20220729_093739_455216_D53C9D6C X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. 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 Now that we can easily extend the named modes list, let's add a few more analog TV modes that were used in the wild, and some unit tests to make sure it works as intended. Signed-off-by: Maxime Ripard diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 3634ac9f787d..09ed5ce7746d 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1853,7 +1853,9 @@ struct drm_named_mode { static const struct drm_named_mode drm_named_modes[] = { { "NTSC", &drm_mode_480i, DRM_MODE_TV_NORM_NTSC_M, }, + { "NTSC_J", &drm_mode_480i, DRM_MODE_TV_NORM_NTSC_J, }, { "PAL", &drm_mode_576i, DRM_MODE_TV_NORM_PAL_B, }, + { "PAL_M", &drm_mode_480i, DRM_MODE_TV_NORM_PAL_M, }, }; static bool drm_mode_parse_cmdline_named_mode(const char *name, diff --git a/drivers/gpu/drm/tests/drm_mode_test.c b/drivers/gpu/drm/tests/drm_mode_test.c index 006b73a61fd4..991eb8ed687c 100644 --- a/drivers/gpu/drm/tests/drm_mode_test.c +++ b/drivers/gpu/drm/tests/drm_mode_test.c @@ -156,6 +156,32 @@ static void drm_mode_named_ntsc(struct kunit *test) KUNIT_EXPECT_TRUE(test, drm_mode_equal(&drm_mode_480i, mode)); } +static void drm_mode_named_ntsc_j(struct kunit *test) +{ + struct drm_mode_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 *mode; + const char *cmdline = "NTSC_J"; + int ret; + + 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_PTR_NE(test, mode, NULL); + + KUNIT_EXPECT_TRUE(test, drm_mode_equal(&drm_mode_480i, mode)); +} + static void drm_mode_named_pal(struct kunit *test) { struct drm_mode_test_priv *priv = test->priv; @@ -182,10 +208,38 @@ static void drm_mode_named_pal(struct kunit *test) KUNIT_EXPECT_TRUE(test, drm_mode_equal(&drm_mode_576i, mode)); } +static void drm_mode_named_pal_m(struct kunit *test) +{ + struct drm_mode_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 *mode; + const char *cmdline = "PAL_M"; + int ret; + + 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_PTR_NE(test, mode, NULL); + + KUNIT_EXPECT_TRUE(test, drm_mode_equal(&drm_mode_480i, mode)); +} + static struct kunit_case drm_mode_tests[] = { KUNIT_CASE(drm_mode_res_1920_1080_60), KUNIT_CASE(drm_mode_named_ntsc), + KUNIT_CASE(drm_mode_named_ntsc_j), KUNIT_CASE(drm_mode_named_pal), + KUNIT_CASE(drm_mode_named_pal_m), {} };