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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1E86C4361B for ; Mon, 7 Dec 2020 15:45:55 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A237423731 for ; Mon, 7 Dec 2020 15:45:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A237423731 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NFE+2uRzSonzFLCpCaVZbjqZJhmrFxEfYN50QzB95Ew=; b=jTGIuEMiG/XBQjKTYOoXsekZz o5DyuMdjVOHNdz3K3WITd07OB2bDRP8QRi4ur1LrFbebbKiZgS5nR79k+V14N2HKd36EQDgCXPvb+ UUkEuUD85Be55OMo8F4LNvnmmB4GdVhl9j10SLX3wWUy8nxkguRLV0aoNXxHt/s6nFXuw33P73IDx CkPhQeaPeZEtGDZRNE4ArFMQoXH+ZmPjghNGOR1pdRoqeWXQ1GM+cpzgqDKHjoZMCIzAJKkcy1S3E YT0NQ0NLQUmssvMyD/I5W3Za3+63p8hhTtG2v8XlglHsOA0NbawTwgy35m+5rDIf1Da0dsyMCXvwU s8Hygjbgw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmIgo-0002Cj-3O; Mon, 07 Dec 2020 15:44:38 +0000 Received: from out5-smtp.messagingengine.com ([66.111.4.29]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmIgm-0002Bo-0N; Mon, 07 Dec 2020 15:44:36 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5AF125C00F4; Mon, 7 Dec 2020 10:44:31 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 07 Dec 2020 10:44:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=ANrgVw61p46aLOYRQc84Vk5I4FX qZ6u0kZMVgXKeTtI=; b=vVj/pfCIYrobYmIcvqafsCzsSls8YM1Pd0bBmq/CSAh A/oOxfv+vUrQJD77MGFA5+DoekIoN6OFSgseDjB1KoexMBONVH0lY2wA6tP7l9qP CJhmkNvObX9ca5sHivevvD8AQ+MBnflb/fKivihnD7yMIkcO8GFc1xFzwcYfYEEG VWwBCxmw0ik8XrLNChPV1m3M7PXkuG0stmG843nCTeq8elUcrasOXFDZoqQDzPVh tnHubPIrt5sPq4S+pyTC7Svfu4WOPpxAaD/BFDVSBIMhgW3/538ev3njpVPsbzIc TNxvfAwhKUAHVDTtbPJFRtvCmhcCPR1S9xhZMPkKc9Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ANrgVw 61p46aLOYRQc84Vk5I4FXqZ6u0kZMVgXKeTtI=; b=n5LOFZayDZxbhPKJfpdtPr ecltXnTkMM5JBB2RCzXkh6s69sGiFujrl1j+GGEcUoWfmrG4pcITX46BjQ1pWexf Xvm+6Gxr0lEvoywcCicVqDK4ml/FsbQH6SmenWoigPHzoYoI0BzCWvSQ6GZ2jgMk hI2KKAysWaWTOJToJKaoJUINvEND8NMZu6Fetitz6HdAFLEDknr6CzuoS86GiLEC 5qdrNBHFIHiuJDMX3jYkB9Kq+kCIBdhS5pRY+rP8QyR7QimGRaOxiKCm70yXR8NB wXz2ONUIFZPV3jiI4Lt+FWsBjQAc/0iKtBMFIo5YWqqoBY6HBNmvzsLNMN5U7/0g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejgedgjeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepleekgeehhfdutdeljefgleejffehfffgieejhffgueefhfdtveetgeehieeh gedunecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id EAAD3240064; Mon, 7 Dec 2020 10:44:28 -0500 (EST) Date: Mon, 7 Dec 2020 16:44:27 +0100 From: Maxime Ripard To: Thomas Zimmermann Subject: Re: [PATCH v4 5/8] drm/vc4: hdmi: Store pixel frequency in the connector state Message-ID: <20201207154427.uvhhnwrtmwagas33@gilmour> References: <20201207133948.2109194-1-maxime@cerno.tech> <20201207133948.2109194-6-maxime@cerno.tech> <201be890-781d-0c94-7f42-df761e4facac@suse.de> MIME-Version: 1.0 In-Reply-To: <201be890-781d-0c94-7f42-df761e4facac@suse.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201207_104436_228106_F510D25D X-CRM114-Status: GOOD ( 23.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Stevenson , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org, Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org Content-Type: multipart/mixed; boundary="===============5739500311175389996==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============5739500311175389996== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gypjzd3dklatuk4b" Content-Disposition: inline --gypjzd3dklatuk4b Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Thomas, On Mon, Dec 07, 2020 at 03:14:49PM +0100, Thomas Zimmermann wrote: > Am 07.12.20 um 14:39 schrieb Maxime Ripard: > > The pixel rate is for now quite simple to compute, but with more featur= es > > (30 and 36 bits output, YUV output, etc.) will depend on a bunch of > > connectors properties. > >=20 > > Let's store the rate we have to run the pixel clock at in our custom > > connector state, and compute it in atomic_check. > >=20 > > Signed-off-by: Maxime Ripard > > --- > > drivers/gpu/drm/vc4/vc4_hdmi.c | 26 +++++++++++++++++++++++++- > > drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + > > 2 files changed, 26 insertions(+), 1 deletion(-) > >=20 > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_h= dmi.c > > index 862c93708e9a..c1667cfe37db 100644 > > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > > @@ -194,6 +194,7 @@ vc4_hdmi_connector_duplicate_state(struct drm_conne= ctor *connector) > > if (!new_state) > > return NULL; > > + new_state->pixel_rate =3D vc4_state->pixel_rate; > > __drm_atomic_helper_connector_duplicate_state(connector, &new_state-= >base); > > return &new_state->base; > > @@ -611,9 +612,29 @@ static void vc4_hdmi_recenter_fifo(struct vc4_hdmi= *vc4_hdmi) > > "VC4_HDMI_FIFO_CTL_RECENTER_DONE"); > > } > > +static struct drm_connector_state * > > +vc4_hdmi_encoder_get_connector_state(struct drm_encoder *encoder, > > + struct drm_atomic_state *state) > > +{ > > + struct drm_connector_state *conn_state; > > + struct drm_connector *connector; > > + unsigned int i; > > + > > + for_each_new_connector_in_state(state, connector, conn_state, i) { > > + if (conn_state->best_encoder =3D=3D encoder) > > + return conn_state; > > + } > > + > > + return NULL; > > +} > > + > > static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *e= ncoder, > > struct drm_atomic_state *state) > > { > > + struct drm_connector_state *conn_state =3D > > + vc4_hdmi_encoder_get_connector_state(encoder, state); > > + struct vc4_hdmi_connector_state *vc4_conn_state =3D > > + conn_state_to_vc4_hdmi_conn_state(conn_state); > > struct drm_display_mode *mode =3D &encoder->crtc->state->adjusted_mo= de; > > struct vc4_hdmi *vc4_hdmi =3D encoder_to_vc4_hdmi(encoder); > > unsigned long pixel_rate, hsm_rate; > > @@ -625,7 +646,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(str= uct drm_encoder *encoder, > > return; > > } > > - pixel_rate =3D mode->clock * 1000 * ((mode->flags & DRM_MODE_FLAG_DBL= CLK) ? 2 : 1); >=20 > Has (mode->flags & DRM_MODE_FLAG_DBLCLK) been lost? I cannot find it any > longer. The code in atomic_check() looks significantly different. Indeed, it's a mistake from a previous patch. I'll send a fix for that one = too. Thanks! Maxime --gypjzd3dklatuk4b Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX85N2wAKCRDj7w1vZxhR xUaeAQDVZHnWt5F11d/qxypVJb57LK7hwc2tp6A1pbVsd2hISQEApj+0WoW0d2xs 6MAOZRDb52IwiNm6XH8AzJqivELFpgw= =PvRH -----END PGP SIGNATURE----- --gypjzd3dklatuk4b-- --===============5739500311175389996== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============5739500311175389996==--