From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.domeneshop.no (smtp.domeneshop.no [194.63.252.55]) (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 20AAE7F for ; Sun, 6 Nov 2022 13:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org ; s=ds202112; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMkrGiKjQARt2b1aRk4pazVxkvnsAA/PLEWp9b0wo3Q=; b=i+cfGJ0TFEvF+5jVH1Ze8k0jA/ 4Rh0pBnFagvOQsjCV12kcMbzhXDsajlVPKjNnzCVbEWB81OqyI2NbZn7c3liqKm2VVJKhAj8YrfR4 vfkkJJG2AXL2qAHN07JVuPCQ6JsIGOUU2NIB4gsX+0Fs1PMsHI0VhuPC3+Po+X3W7RA8YPE3k4hVt eEWLB8VD+Kb0qs5U2cK3Ja8uXbcOJ7b4EnSzPravJlBEmDecT+4+7lwPdVOuIHb1yYSF+bJofr0ue LTVL1bdl+w6yMpZJ1iEthOBGDABurSxlTji+0Mm6/Tm8JeMGt7XOMa6X+snscDmL7PPJORkoh5gkC g//My1qA==; Received: from [2a01:799:95a:cb00:a93e:4a2b:2c13:303] (port=57982) by smtp.domeneshop.no with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1orfMI-00019n-JX; Sun, 06 Nov 2022 14:06:42 +0100 Message-ID: <887bb962-ef79-0e89-4100-62729d148911@tronnes.org> Date: Sun, 6 Nov 2022 14:06:37 +0100 Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v6 11/23] drm/connector: Add pixel clock to cmdline mode To: maxime@cerno.tech, 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: linux-sunxi@lists.linux.dev, intel-gfx@lists.freedesktop.org, Phil Elwell , linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, Hans de Goede , Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, Dave Stevenson , linux-kernel@vger.kernel.org, Geert Uytterhoeven , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= In-Reply-To: <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Den 26.10.2022 17.33, skrev maxime@cerno.tech: > 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 > --- I would just squash this with the previous patch, either way: 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: > * > From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 0EDD6C4332F for ; Sun, 6 Nov 2022 13:06:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E53310E16D; Sun, 6 Nov 2022 13:06:47 +0000 (UTC) Received: from smtp.domeneshop.no (smtp.domeneshop.no [IPv6:2a01:5b40:0:3005::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E4C510E169; Sun, 6 Nov 2022 13:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org ; s=ds202112; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMkrGiKjQARt2b1aRk4pazVxkvnsAA/PLEWp9b0wo3Q=; b=i+cfGJ0TFEvF+5jVH1Ze8k0jA/ 4Rh0pBnFagvOQsjCV12kcMbzhXDsajlVPKjNnzCVbEWB81OqyI2NbZn7c3liqKm2VVJKhAj8YrfR4 vfkkJJG2AXL2qAHN07JVuPCQ6JsIGOUU2NIB4gsX+0Fs1PMsHI0VhuPC3+Po+X3W7RA8YPE3k4hVt eEWLB8VD+Kb0qs5U2cK3Ja8uXbcOJ7b4EnSzPravJlBEmDecT+4+7lwPdVOuIHb1yYSF+bJofr0ue LTVL1bdl+w6yMpZJ1iEthOBGDABurSxlTji+0Mm6/Tm8JeMGt7XOMa6X+snscDmL7PPJORkoh5gkC g//My1qA==; Received: from [2a01:799:95a:cb00:a93e:4a2b:2c13:303] (port=57982) by smtp.domeneshop.no with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1orfMI-00019n-JX; Sun, 06 Nov 2022 14:06:42 +0100 Message-ID: <887bb962-ef79-0e89-4100-62729d148911@tronnes.org> Date: Sun, 6 Nov 2022 14:06:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 To: maxime@cerno.tech, 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 References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= In-Reply-To: <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Nouveau] [PATCH v6 11/23] drm/connector: Add pixel clock to cmdline mode X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Phil Elwell , Hans de Goede , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= , Geert Uytterhoeven , Mateusz Kwiatkowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" Den 26.10.2022 17.33, skrev maxime@cerno.tech: > 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 > --- I would just squash this with the previous patch, either way: 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: > * > From mboxrd@z Thu Jan 1 00:00:00 1970 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 1DC0DC433FE for ; Sun, 6 Nov 2022 13:07:47 +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:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eY84DJESxs4BgNw9v4CFt3yvOzgs5+O+g+t5m/+nHLk=; b=iLmISPTgcpoqAu 16K3bCDMODhqj8K3WdCg2ZZ9W3IftHLyOkNzdNck9sTi98CEjMuuSD8X8m/jA9BAsk3S5YfNnaPmg yFge0JeRbn7v2xtsc1zPsHZ0idvmhvQEC5Xhug20co8dWIZz0eZYgg7Uve+RUkq0I3wlAMLOq6Gx2 fahaBEi+lRz2n5esZ/ZsKUqLTYMGypphUzAdPfNQk6YZCv93zmn/32vc6+Ha1YeAZfcE0TVbZiW7C EjS/FOxOo7nGmDUuvQWpv/FOJKAs4tc8liJLdYt0v8FSFQIciXUFLOX/jGnhZzuOwaVizYJODagjA Z0NjewPneEIP66hk+MaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orfMO-008HIk-0x; Sun, 06 Nov 2022 13:06:48 +0000 Received: from smtp.domeneshop.no ([2a01:5b40:0:3005::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1orfMK-008HHA-Vm for linux-arm-kernel@lists.infradead.org; Sun, 06 Nov 2022 13:06:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org ; s=ds202112; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMkrGiKjQARt2b1aRk4pazVxkvnsAA/PLEWp9b0wo3Q=; b=i+cfGJ0TFEvF+5jVH1Ze8k0jA/ 4Rh0pBnFagvOQsjCV12kcMbzhXDsajlVPKjNnzCVbEWB81OqyI2NbZn7c3liqKm2VVJKhAj8YrfR4 vfkkJJG2AXL2qAHN07JVuPCQ6JsIGOUU2NIB4gsX+0Fs1PMsHI0VhuPC3+Po+X3W7RA8YPE3k4hVt eEWLB8VD+Kb0qs5U2cK3Ja8uXbcOJ7b4EnSzPravJlBEmDecT+4+7lwPdVOuIHb1yYSF+bJofr0ue LTVL1bdl+w6yMpZJ1iEthOBGDABurSxlTji+0Mm6/Tm8JeMGt7XOMa6X+snscDmL7PPJORkoh5gkC g//My1qA==; Received: from [2a01:799:95a:cb00:a93e:4a2b:2c13:303] (port=57982) by smtp.domeneshop.no with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1orfMI-00019n-JX; Sun, 06 Nov 2022 14:06:42 +0100 Message-ID: <887bb962-ef79-0e89-4100-62729d148911@tronnes.org> Date: Sun, 6 Nov 2022 14:06:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v6 11/23] drm/connector: Add pixel clock to cmdline mode To: maxime@cerno.tech, 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: linux-sunxi@lists.linux.dev, intel-gfx@lists.freedesktop.org, Phil Elwell , linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, Hans de Goede , Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, Dave Stevenson , linux-kernel@vger.kernel.org, Geert Uytterhoeven , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= In-Reply-To: <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221106_050645_041539_43031B83 X-CRM114-Status: GOOD ( 17.17 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CgpEZW4gMjYuMTAuMjAyMiAxNy4zMywgc2tyZXYgbWF4aW1lQGNlcm5vLnRlY2g6Cj4gV2UnbGwg bmVlZCB0byBnZXQgdGhlIHBpeGVsIGNsb2NrIHRvIGdlbmVyYXRlIHByb3BlciBkaXNwbGF5IG1v ZGVzIGZvcgo+IGFsbCB0aGUgY3VycmVudCBuYW1lZCBtb2Rlcy4gTGV0J3MgYWRkIGl0IHRvIHN0 cnVjdCBkcm1fY21kbGluZV9tb2RlIGFuZAo+IGZpbGwgaXQgd2hlbiBwYXJzaW5nIHRoZSBuYW1l ZCBtb2RlLgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZUBjZXJuby50 ZWNoPgo+IC0tLQoKSSB3b3VsZCBqdXN0IHNxdWFzaCB0aGlzIHdpdGggdGhlIHByZXZpb3VzIHBh dGNoLCBlaXRoZXIgd2F5OgoKUmV2aWV3ZWQtYnk6IE5vcmFsZiBUcsO4bm5lcyA8bm9yYWxmQHRy b25uZXMub3JnPgoKPiAgZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIHwgOSArKysrKystLS0K PiAgaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oIHwgNyArKysrKysrCj4gIDIgZmlsZXMgY2hh bmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5j Cj4gaW5kZXggYWNlZTIzZTFhOGI3Li5jODI2Zjk1ODNhMWQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2RybV9tb2Rlcy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5j Cj4gQEAgLTIyMjYsMjIgKzIyMjYsMjQgQEAgc3RhdGljIGludCBkcm1fbW9kZV9wYXJzZV9jbWRs aW5lX29wdGlvbnMoY29uc3QgY2hhciAqc3RyLAo+ICAKPiAgc3RydWN0IGRybV9uYW1lZF9tb2Rl IHsKPiAgCWNvbnN0IGNoYXIgKm5hbWU7Cj4gKwl1bnNpZ25lZCBpbnQgcGl4ZWxfY2xvY2tfa2h6 Owo+ICAJdW5zaWduZWQgaW50IHhyZXM7Cj4gIAl1bnNpZ25lZCBpbnQgeXJlczsKPiAgCXVuc2ln bmVkIGludCBmbGFnczsKPiAgfTsKPiAgCj4gLSNkZWZpbmUgTkFNRURfTU9ERShfbmFtZSwgX3gs IF95LCBfZmxhZ3MpCQlcCj4gKyNkZWZpbmUgTkFNRURfTU9ERShfbmFtZSwgX3BjbGssIF94LCBf eSwgX2ZsYWdzKQlcCj4gIAl7CQkJCQkJXAo+ICAJCS5uYW1lID0gX25hbWUsCQkJCVwKPiArCQku cGl4ZWxfY2xvY2tfa2h6ID0gX3BjbGssCQlcCj4gIAkJLnhyZXMgPSBfeCwJCQkJXAo+ICAJCS55 cmVzID0gX3ksCQkJCVwKPiAgCQkuZmxhZ3MgPSBfZmxhZ3MsCQkJXAo+ICAJfQo+ICAKPiAgc3Rh dGljIGNvbnN0IHN0cnVjdCBkcm1fbmFtZWRfbW9kZSBkcm1fbmFtZWRfbW9kZXNbXSA9IHsKPiAt CU5BTUVEX01PREUoIk5UU0MiLCA3MjAsIDQ4MCwgRFJNX01PREVfRkxBR19JTlRFUkxBQ0UpLAo+ IC0JTkFNRURfTU9ERSgiUEFMIiwgNzIwLCA1NzYsIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKSwK PiArCU5BTUVEX01PREUoIk5UU0MiLCAxMzUwMCwgNzIwLCA0ODAsIERSTV9NT0RFX0ZMQUdfSU5U RVJMQUNFKSwKPiArCU5BTUVEX01PREUoIlBBTCIsIDEzNTAwLCA3MjAsIDU3NiwgRFJNX01PREVf RkxBR19JTlRFUkxBQ0UpLAo+ICB9Owo+ICAKPiAgc3RhdGljIGludCBkcm1fbW9kZV9wYXJzZV9j bWRsaW5lX25hbWVkX21vZGUoY29uc3QgY2hhciAqbmFtZSwKPiBAQCAtMjI4Miw2ICsyMjg0LDcg QEAgc3RhdGljIGludCBkcm1fbW9kZV9wYXJzZV9jbWRsaW5lX25hbWVkX21vZGUoY29uc3QgY2hh ciAqbmFtZSwKPiAgCQkJY29udGludWU7Cj4gIAo+ICAJCXN0cmNweShjbWRsaW5lX21vZGUtPm5h bWUsIG1vZGUtPm5hbWUpOwo+ICsJCWNtZGxpbmVfbW9kZS0+cGl4ZWxfY2xvY2sgPSBtb2RlLT5w aXhlbF9jbG9ja19raHo7Cj4gIAkJY21kbGluZV9tb2RlLT54cmVzID0gbW9kZS0+eHJlczsKPiAg CQljbWRsaW5lX21vZGUtPnlyZXMgPSBtb2RlLT55cmVzOwo+ICAJCWNtZGxpbmVfbW9kZS0+aW50 ZXJsYWNlID0gISEobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSk7Cj4gZGlm ZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaCBiL2luY2x1ZGUvZHJtL2RybV9j b25uZWN0b3IuaAo+IGluZGV4IDk2YjJlNGUxMjMzNC4uNWM1ZTY3ZGUyMjk2IDEwMDY0NAo+IC0t LSBhL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaAo+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9j b25uZWN0b3IuaAo+IEBAIC0xMjczLDYgKzEyNzMsMTMgQEAgc3RydWN0IGRybV9jbWRsaW5lX21v ZGUgewo+ICAJICovCj4gIAlib29sIGJwcF9zcGVjaWZpZWQ7Cj4gIAo+ICsJLyoqCj4gKwkgKiBA cGl4ZWxfY2xvY2s6Cj4gKwkgKgo+ICsJICogUGl4ZWwgQ2xvY2sgaW4ga0h6LiBPcHRpb25hbC4K PiArCSAqLwo+ICsJdW5zaWduZWQgaW50IHBpeGVsX2Nsb2NrOwo+ICsKPiAgCS8qKgo+ICAJICog QHhyZXM6Cj4gIAkgKgo+IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBs aXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlz dGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 35ACCC4332F for ; Sun, 6 Nov 2022 13:06:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3422E10E169; Sun, 6 Nov 2022 13:06:47 +0000 (UTC) Received: from smtp.domeneshop.no (smtp.domeneshop.no [IPv6:2a01:5b40:0:3005::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E4C510E169; Sun, 6 Nov 2022 13:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org ; s=ds202112; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMkrGiKjQARt2b1aRk4pazVxkvnsAA/PLEWp9b0wo3Q=; b=i+cfGJ0TFEvF+5jVH1Ze8k0jA/ 4Rh0pBnFagvOQsjCV12kcMbzhXDsajlVPKjNnzCVbEWB81OqyI2NbZn7c3liqKm2VVJKhAj8YrfR4 vfkkJJG2AXL2qAHN07JVuPCQ6JsIGOUU2NIB4gsX+0Fs1PMsHI0VhuPC3+Po+X3W7RA8YPE3k4hVt eEWLB8VD+Kb0qs5U2cK3Ja8uXbcOJ7b4EnSzPravJlBEmDecT+4+7lwPdVOuIHb1yYSF+bJofr0ue LTVL1bdl+w6yMpZJ1iEthOBGDABurSxlTji+0Mm6/Tm8JeMGt7XOMa6X+snscDmL7PPJORkoh5gkC g//My1qA==; Received: from [2a01:799:95a:cb00:a93e:4a2b:2c13:303] (port=57982) by smtp.domeneshop.no with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1orfMI-00019n-JX; Sun, 06 Nov 2022 14:06:42 +0100 Message-ID: <887bb962-ef79-0e89-4100-62729d148911@tronnes.org> Date: Sun, 6 Nov 2022 14:06:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v6 11/23] drm/connector: Add pixel clock to cmdline mode To: maxime@cerno.tech, 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 References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= In-Reply-To: <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Phil Elwell , Hans de Goede , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= , Geert Uytterhoeven , Mateusz Kwiatkowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Den 26.10.2022 17.33, skrev maxime@cerno.tech: > 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 > --- I would just squash this with the previous patch, either way: 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: > * > From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A79C9C43217 for ; Sun, 6 Nov 2022 13:06:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CDBE710E171; Sun, 6 Nov 2022 13:06:47 +0000 (UTC) Received: from smtp.domeneshop.no (smtp.domeneshop.no [IPv6:2a01:5b40:0:3005::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E4C510E169; Sun, 6 Nov 2022 13:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org ; s=ds202112; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMkrGiKjQARt2b1aRk4pazVxkvnsAA/PLEWp9b0wo3Q=; b=i+cfGJ0TFEvF+5jVH1Ze8k0jA/ 4Rh0pBnFagvOQsjCV12kcMbzhXDsajlVPKjNnzCVbEWB81OqyI2NbZn7c3liqKm2VVJKhAj8YrfR4 vfkkJJG2AXL2qAHN07JVuPCQ6JsIGOUU2NIB4gsX+0Fs1PMsHI0VhuPC3+Po+X3W7RA8YPE3k4hVt eEWLB8VD+Kb0qs5U2cK3Ja8uXbcOJ7b4EnSzPravJlBEmDecT+4+7lwPdVOuIHb1yYSF+bJofr0ue LTVL1bdl+w6yMpZJ1iEthOBGDABurSxlTji+0Mm6/Tm8JeMGt7XOMa6X+snscDmL7PPJORkoh5gkC g//My1qA==; Received: from [2a01:799:95a:cb00:a93e:4a2b:2c13:303] (port=57982) by smtp.domeneshop.no with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1orfMI-00019n-JX; Sun, 06 Nov 2022 14:06:42 +0100 Message-ID: <887bb962-ef79-0e89-4100-62729d148911@tronnes.org> Date: Sun, 6 Nov 2022 14:06:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 To: maxime@cerno.tech, 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 References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= In-Reply-To: <20220728-rpi-analog-tv-properties-v6-11-e7792734108f@cerno.tech> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH v6 11/23] drm/connector: Add pixel clock to cmdline mode X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Phil Elwell , Hans de Goede , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= , Geert Uytterhoeven , Mateusz Kwiatkowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Den 26.10.2022 17.33, skrev maxime@cerno.tech: > 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 > --- I would just squash this with the previous patch, either way: 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: > * >