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=-15.3 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,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 7574DC4361B for ; Tue, 8 Dec 2020 07:56:39 +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 34F3823A51 for ; Tue, 8 Dec 2020 07:56:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34F3823A51 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de 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:Date:Message-ID:From:References:To:Subject: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=lfFk0z3L1902TXWiGlZQBLb741JAnz4Gcarfbv6Jik8=; b=EeSlIpwIqiYxYIWsdrHdn3JbN fMWs9RGte+6ZWzCUQ1fnntul+y4l9mxDOgNW0IFkbHHjZdY6bNRzgtD9AsmytKgLg0F/ScuBGoUIu N6gVpsoUs7sfRkGzz+0U4XflCj6/9xKA+qTRUBr1Dfk3qsuzFKplXmNXk/JZMjscQYI7RV+Rx9qri /qretUuIZ3T8k5fjIeRAImq+VuE+eUCHqe+FoqWXhauN/0QoRs0qWZcZLEZ5pM321Q9qVmZ3kyb3F vmFwisM7NkzOLw617LTE8apVH3hI8BFD+rPtU1fu6vMqxOfX8T+eOeNHozf3VC6FwA3MQQZDsXlON ztKreNbrw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmXqL-0002MI-Eh; Tue, 08 Dec 2020 07:55:29 +0000 Received: from mx2.suse.de ([195.135.220.15]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmXqJ-0002LJ-4S; Tue, 08 Dec 2020 07:55:28 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 002FFAB63; Tue, 8 Dec 2020 07:55:25 +0000 (UTC) Subject: Re: [PATCH v5 6/9] drm/vc4: hdmi: Store pixel frequency in the connector state To: Maxime Ripard , Daniel Vetter , David Airlie , Eric Anholt , Maarten Lankhorst References: <20201207155719.17149-1-maxime@cerno.tech> <20201207155719.17149-7-maxime@cerno.tech> From: Thomas Zimmermann Message-ID: Date: Tue, 8 Dec 2020 08:55:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20201207155719.17149-7-maxime@cerno.tech> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201208_025527_421120_C7BC7D35 X-CRM114-Status: GOOD ( 29.44 ) 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: linux-rpi-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Dave Stevenson Content-Type: multipart/mixed; boundary="===============7840910984130024911==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============7840910984130024911== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PsXHK89KT8MBiy17Vukk9CfwczsgHJYzt" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PsXHK89KT8MBiy17Vukk9CfwczsgHJYzt Content-Type: multipart/mixed; boundary="AkmXZ4e6NUgz1bxNkvTKAEKrVeqflhd9A"; protected-headers="v1" From: Thomas Zimmermann To: Maxime Ripard , Daniel Vetter , David Airlie , Eric Anholt , Maarten Lankhorst Cc: Dave Stevenson , bcm-kernel-feedback-list@broadcom.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Message-ID: Subject: Re: [PATCH v5 6/9] drm/vc4: hdmi: Store pixel frequency in the connector state References: <20201207155719.17149-1-maxime@cerno.tech> <20201207155719.17149-7-maxime@cerno.tech> In-Reply-To: <20201207155719.17149-7-maxime@cerno.tech> --AkmXZ4e6NUgz1bxNkvTKAEKrVeqflhd9A Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Am 07.12.20 um 16:57 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 Acked-by: Thomas Zimmermann > --- > 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 744396c8dcb9..83699105c7a5 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; > =20 > + new_state->pixel_rate =3D vc4_state->pixel_rate; > __drm_atomic_helper_connector_duplicate_state(connector, &new_state-= >base); > =20 > 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"); > } > =20 > +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; > } > =20 > - pixel_rate =3D mode->clock * 1000 * ((mode->flags & DRM_MODE_FLAG_DBL= CLK) ? 2 : 1); > + pixel_rate =3D vc4_conn_state->pixel_rate; > ret =3D clk_set_rate(vc4_hdmi->pixel_clock, pixel_rate); > if (ret) { > DRM_ERROR("Failed to set pixel clock rate: %d\n", ret); > @@ -797,6 +818,7 @@ static int vc4_hdmi_encoder_atomic_check(struct drm= _encoder *encoder, > struct drm_crtc_state *crtc_state, > struct drm_connector_state *conn_state) > { > + struct vc4_hdmi_connector_state *vc4_state =3D conn_state_to_vc4_hdmi= _conn_state(conn_state); > struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; > struct vc4_hdmi *vc4_hdmi =3D encoder_to_vc4_hdmi(encoder); > unsigned long long pixel_rate =3D mode->clock * 1000; > @@ -827,6 +849,8 @@ static int vc4_hdmi_encoder_atomic_check(struct drm= _encoder *encoder, > if (pixel_rate > vc4_hdmi->variant->max_pixel_clock) > return -EINVAL; > =20 > + vc4_state->pixel_rate =3D pixel_rate; > + > return 0; > } > =20 > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_h= dmi.h > index 2cf5362052e2..bca6943de884 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h > @@ -182,6 +182,7 @@ encoder_to_vc4_hdmi(struct drm_encoder *encoder) > =20 > struct vc4_hdmi_connector_state { > struct drm_connector_state base; > + unsigned long long pixel_rate; > }; > =20 > static inline struct vc4_hdmi_connector_state * >=20 --=20 Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany (HRB 36809, AG N=C3=BCrnberg) Gesch=C3=A4ftsf=C3=BChrer: Felix Imend=C3=B6rffer --AkmXZ4e6NUgz1bxNkvTKAEKrVeqflhd9A-- --PsXHK89KT8MBiy17Vukk9CfwczsgHJYzt Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEExndm/fpuMUdwYFFolh/E3EQov+AFAl/PMWwFAwAAAAAACgkQlh/E3EQov+BJ SQ//U+C+z8CfP5Pca5Oz7429W7x16HWdFwJQb2pDofsum40de+XBsoTZQAKKC3Hs/3L5RWgEoINN PV927HwQeXgz99DYN5u6++VkOvUvSag4JQ2PauEBBnZWND1BRyjSLFi8lOSs36eV5WwvdumLu1uo K48pFVC+neQV2J+KYtg0XFkZuPB2LZ/MDsGR14ovjFoh8OZlyHTQDux034VxWLoUu9PFUPQgnw2s wmTTaFjFCahq5EHUS9V17b7NnL8HIRdNib3nMuFXV2tSVbPfY53jXoAdXxDBUed6eoQVuKQbUIKu aLpYF1Bq5X86nMh4DlAK5UNxaqF7ql7BL3QmXM+2QlnQ2K10V3oMukklyxcJdWb1bKJ8XpU+98UA w4UeNx7ae1e+3aWmPvBtXrrxy7SyDjhCCruNi907M+2tI5ylsT6fmVqPozDCT+9y0XrqfdkL6JIk LEeBOrf0vH6bY/aVl/2hCMsvGZ+LRfUa67KULnCgWVoNfT82YdHcJS+HVkbXtBPSzQSGEt7RKGzb nA92kxAY7gk8ZS/E5Ydb99IGeXyqk/Vq9jW6smwNej2BTG7SrT5iX/AGlpRVrn/3uPI3haap8IPE 6nlFK5+NtHEeWJ5NnVAk5tiiLwAuH/v9ixkPIKDhvWs7K9lvdmw3LS4AQDbtWgqNDtGwlnjVQMZl 7jk= =nVxt -----END PGP SIGNATURE----- --PsXHK89KT8MBiy17Vukk9CfwczsgHJYzt-- --===============7840910984130024911== 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 --===============7840910984130024911==--