From patchwork Wed Oct 26 15:33:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13020830 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 7A190C38A2D for ; Wed, 26 Oct 2022 15:40:50 +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=Iin9Pjl2zTvJ5IGA9Ve59OkUKp8ovtLM/tAsXtilcBA=; b=MKlZsZt0quou3a AZU3EaTrVr9huons97NWCrtUIJJThFy0HQxMyLMNMtkWaeY6J0oO5ifsIIyxXX6f/hEZowPLwJuYT sJQFBquzy4TQVuCekSe4e+6G5/Ib7KcwnBs+pxA4irFZsYiNzCf9ypHeKMt3DzAIs4vaz8zJznI6U FEojwSckQihL1d7t2JXVJaIr+2P7c8qDtrR9BEaatCj6fzX1adpYlMpGcdBCaBs1rx1QSJQFurp5i Bn8aO6yrO1F4fRBfQ1eGJPvtrQz4kGiM/VFPeUOGSrFemDUfef9Eb+m/OAKEeV0LrSr8rae0PidH2 kur7CW4JPJf0/L6G9ZTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oniUt-009wUU-FT; Wed, 26 Oct 2022 15:39:16 +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 1oniPj-009u5V-Ip for linux-arm-kernel@lists.infradead.org; Wed, 26 Oct 2022 15:33:57 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id ED810580391; Wed, 26 Oct 2022 11:33:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 26 Oct 2022 11:33:54 -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=fm3; t=1666798434; x= 1666805634; bh=pyJuUVmoEreLhGIAMfmEWzT9wwvecaBv0R5jhGD7w8s=; b=R F7xiyuwtLYW272iQkBqmMeUm3fbR57enAgOHLGUD+mlnvKPdLrSc8O1JFAOrjXKH zO7oIRx1Paj4zdc/3wDVgVdUQKQFe0VOfBFxUsiQA31nDmaatrsyd1gDRSVtKg4q SXtcH/iYa0vqRc0aRreEClYeCaIBc9ceY9+hVcZH1H2WCzygKjcZkzzXKhxDBrCM 5FMp1NmXNDwM0UFVwS2yx04NQ9WX03GAjl71gsxnpxo9M2j/m5+mmzVlBZqnz2eS 3Zz6q9xdQbkMRnK3H5xomuwCE6FE9PcdpAeYbmUkBWiHP48rAVlG10X6y3vKh74p bM+G4Or/ynQ/o3x+EpGoQ== 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=1666798434; x= 1666805634; bh=pyJuUVmoEreLhGIAMfmEWzT9wwvecaBv0R5jhGD7w8s=; b=S eL9CzazJAUxDpeH8qkKZjhAHmNDcNh0mk4fuV/6QIGANS+G0Ay4rEAbZilKIdup2 /sXgWKeQ3J27p0isyLieL1Yjlr6L44iOCPrp5+wPaHjPpFn5P1H4nJmZUUkdgDLQ 2MNTuevHxYzVJHZiss12QTHNSR3aUJG1dacdpuzzAncw6aAz3iQl/XfHDAPeYK0F oY9VoOXaqy3/+ohjLscf3gj/3kNBznH03Pi59ZmYp7xFxXKvyzMXzKy2oE2bxROW bJPzuukO2M4cd0AFlAmcjnYXGO3+SXb0ekmDG/nyTeCmZoTY1/hHdkollS4NtoIh XY2dpMo2p6trCE7uQ0iWA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffugggtgffkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeefudfhgeevhefhfedtue evueeluddutdetuddtvddvgeekheelvefhteekteeihfenucevlhhushhtvghrufhiiigv pedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:33:53 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:30 +0200 Subject: [PATCH v6 11/23] drm/connector: Add pixel clock to cmdline mode MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul Cc: =?unknown-8bit?q?linux-sunxi=40lists=2Elinux=2Edev=2C_Maxime_Ripard_=3Cm?= =?unknown-8bit?q?axime=40cerno=2Etech=3E=2C_intel-gfx=40lists=2Efreedesktop?= =?unknown-8bit?q?=2Eorg=2C?= =?unknown-8bit?q?_Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_linux-arm-ke?= =?unknown-8bit?q?rnel=40lists=2Einfradead=2Eorg=2C_nouveau=40lists=2Efreede?= =?unknown-8bit?q?sktop=2Eorg=2C?= =?unknown-8bit?q?_Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_Dom_Cobley_?= =?unknown-8bit?q?=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?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_Noralf_Tr=C3=B8n?= =?unknown-8bit?q?nes_=3Cnoralf=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Geert_Uytterhoeven_=3Cgeert=40linux-m68k=2Eorg=3E?= X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=2204; i=maxime@cerno.tech; h=from:subject:message-id; bh=dwBpTlcm4vsh2Otz5VTcJxTcweYnMFBxICZwtkt6WXs=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwW4PbidWyW5NX3FLZ+VO8fnFG0Wyb927Ev0n13ZRgP9r y3fNHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZiIxReGvzJZyvbh6t57SlTZo0s/2z 6q3LVNwvHEQ/OLwc9/bfo4mYnhr2y3wben20qD2+Wt551hC0p+G9FTdlYpVtiiofXwEzURHgA= 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-20221026_083355_738151_110CDECC X-CRM114-Status: GOOD ( 12.05 ) 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 We'll need to get the pixel clock to generate proper display modes for all the current named modes. Let's add it to struct drm_cmdline_mode and fill it when parsing the named mode. Signed-off-by: Maxime Ripard Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/drm_modes.c | 9 ++++++--- include/drm/drm_connector.h | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index acee23e1a8b7..c826f9583a1d 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2226,22 +2226,24 @@ static int drm_mode_parse_cmdline_options(const char *str, struct drm_named_mode { const char *name; + unsigned int pixel_clock_khz; unsigned int xres; unsigned int yres; unsigned int flags; }; -#define NAMED_MODE(_name, _x, _y, _flags) \ +#define NAMED_MODE(_name, _pclk, _x, _y, _flags) \ { \ .name = _name, \ + .pixel_clock_khz = _pclk, \ .xres = _x, \ .yres = _y, \ .flags = _flags, \ } static const struct drm_named_mode drm_named_modes[] = { - NAMED_MODE("NTSC", 720, 480, DRM_MODE_FLAG_INTERLACE), - NAMED_MODE("PAL", 720, 576, DRM_MODE_FLAG_INTERLACE), + NAMED_MODE("NTSC", 13500, 720, 480, DRM_MODE_FLAG_INTERLACE), + NAMED_MODE("PAL", 13500, 720, 576, DRM_MODE_FLAG_INTERLACE), }; static int drm_mode_parse_cmdline_named_mode(const char *name, @@ -2282,6 +2284,7 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, continue; strcpy(cmdline_mode->name, mode->name); + cmdline_mode->pixel_clock = mode->pixel_clock_khz; cmdline_mode->xres = mode->xres; cmdline_mode->yres = mode->yres; cmdline_mode->interlace = !!(mode->flags & DRM_MODE_FLAG_INTERLACE); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 96b2e4e12334..5c5e67de2296 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1273,6 +1273,13 @@ struct drm_cmdline_mode { */ bool bpp_specified; + /** + * @pixel_clock: + * + * Pixel Clock in kHz. Optional. + */ + unsigned int pixel_clock; + /** * @xres: *