From patchwork Thu Sep 22 14:25:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12985351 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 D80BAC6FA82 for ; Thu, 22 Sep 2022 14:48:32 +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=8ql21+Z9FNL/jt+7FgzWQdaO+SR6Td6FG4/s/ydJk/I=; b=XpBNCAKsMrDkwG S3kg7YtLXHertnabjLCBLA65p0q+9Df2NVcU24XIImHSiW+QAq70cdUcXZ7vCMIlFYwPLrzwaFAMG Sb6sevrzOJGnxvVG4mJffsfJ+fYLvRnN1s3IoaMWJVlwmqDCMDrXmK4qjyUaNRcvWKMEt2B099o4Q 4NNQG9LqwzNZTScPMGHr+LpoEjbt/qL7cmtbefP33NbZOcEzu5YV2eDuHA0sSE7r83QFo58y80REv sQzX6Fl26hxzaZaKmlsyiAnKLTfnFDdar2EyW7NKb59d+++BvwgHMtwPRuODfKTYkkB1cRJ30AOUv jq7BfClaZMM0/30KxgIw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNTm-00G9n6-NY; Thu, 22 Sep 2022 14:47:07 +0000 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNBO-00G1JM-RG for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2022 14:28:08 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id AD6282B05B32; Thu, 22 Sep 2022 10:28:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 22 Sep 2022 10:28:06 -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=1663856883; x= 1663864083; bh=0h+j4Ml235vzzhk4vbz+WoFhzY0sO9zK12Ov1UnPsu4=; b=S FZ2SNztZYY3YCcMvY9vU8Fgp9KqOhqXb15Yv+rP4F20N2IB+r2FOGUnaVfvxeCA5 Qs5T0iq8Qxt2gaJWx3dfD4AromirYmJfeztL91DVw0sJWUvsSkS6PoZAy3d7RdLB WET8r3vliStt9LpAeIU6whif9xRrEcO25hMQ30gKvXzfGYL9NV3US+3sHyggkzyw uNDkyOvOPE4e0nsw31ZUMw1vTahmLowaMOjBSS+BZ02wZc/h3X9hOei9vP3iCkuD j9kPeUqWYihzmL6GS2MRi3Uiw+22Yb6eQmTWweqObpWviMxHa1qTBCykhKuU7AWF tMr5v0zeBVpgxZGZ0lOaQ== 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=fm2; t=1663856883; x= 1663864083; bh=0h+j4Ml235vzzhk4vbz+WoFhzY0sO9zK12Ov1UnPsu4=; b=C xObU6mMlJxh0xcyUVe0lAfXA03pbupq3cG9zYOXnX8OmH7td8dTes8keWJdOrvKv m79YxYTwu3fVFyRbYX6Anz9qIn3yLBOs5z0+OFExR7/oTYK+lnAjYGN/DuHquIpA gbYZpy33igVSGf8kLtcDpRSJ8bDFxNh/WmtD9j5kPNOgXZKk0zm7Eo9phve1T/7S fnvVfPEI7sFDGYKE/5RkNnM+9gNnEPxQTO08iIlIR9P7yczHq1wnDb9uN098qMQy Al0x05A/rxQHzEHWVjASfPZEdm33gxu/auFNblF4f1HJABD1dzDq73TstZxlY6Cb +XGRVoX2PwW0YVpkaKwjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefgedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepudduudfhveejteefgedvffdvvedvjedugedukeejhedtlefhffevtefh jeeltdevnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 10:28:01 -0400 (EDT) From: Maxime Ripard Date: Thu, 22 Sep 2022 16:25:38 +0200 Subject: [PATCH v2 21/33] drm/connector: Add pixel clock to cmdline mode MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v2-21-f733a0ed9f90@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> To: Jernej Skrabec , Rodrigo Vivi , Ben Skeggs , David Airlie , Maxime Ripard , Joonas Lahtinen , Emma Anholt , Karol Herbst , Samuel Holland , Jani Nikula , Thomas Zimmermann , Daniel Vetter , Lyude Paul , Maarten Lankhorst , Tvrtko Ursulin , Chen-Yu Tsai Cc: =?unknown-8bit?q?Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_nouveau?= =?unknown-8bit?q?=40lists=2Efreedesktop=2Eorg=2C_Geert_Uytterhoeven_=3Cgeer?= =?unknown-8bit?q?t=40linux-m68k=2Eorg=3E=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_linux-arm-kernel?= =?unknown-8bit?q?=40lists=2Einfradead=2Eorg=2C?= =?unknown-8bit?q?_Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_intel-gfx=40?= =?unknown-8bit?q?lists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes_=3Cnoralf?= =?unknown-8bit?q?=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Dom_Cobley_=3Cdom=40raspberrypi=2Ecom=3E=2C_linux-sunxi=40?= =?unknown-8bit?q?lists=2Elinux=2Edev=2C_Maxime_Ripard_=3Cmaxime=40cerno=2Et?= =?unknown-8bit?q?ech=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_dri-devel=40lists=2Efreedesktop=2Eorg?= X-Mailer: b4 0.10.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2051; i=maxime@cerno.tech; h=from:subject:message-id; bh=rxoD3Af1weJFe2uj/nLNvKWNvmy0Jf/ctDPA3MS5OG0=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk6BYFzp3Yzxmc6Vy27uMBAa8rKkPJUx0sl609r/w9vkb/y +uf5jlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzknBTDHz57x5nmH9UKKsN+5azbaq 7L+bzp3VUV7drL85fUhPy+c5mRYfKaG15zJp5WUFz0eeMD/o3Ns/JXBj1xsfm4QEVfQuiLMxMA 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-20220922_072806_936159_DD408F06 X-CRM114-Status: UNSURE ( 9.69 ) 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 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 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 5d8b6a0d96f3..eb3c4e596c67 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, @@ -2286,6 +2288,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 fffacbfd0a45..80e19efb3f42 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1279,6 +1279,13 @@ struct drm_cmdline_mode { */ bool bpp_specified; + /** + * @pixel_clock: + * + * Pixel Clock in kHz. Optional. + */ + unsigned int pixel_clock; + /** * @xres: *