From: Maxime Ripard <maxime@cerno.tech>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
dri-devel@lists.freedesktop.org, Eric Anholt <eric@anholt.net>,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
Daniel Vetter <daniel.vetter@intel.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 5/8] drm/vc4: hdmi: Store pixel frequency in the connector state
Date: Mon, 7 Dec 2020 16:44:27 +0100 [thread overview]
Message-ID: <20201207154427.uvhhnwrtmwagas33@gilmour> (raw)
In-Reply-To: <201be890-781d-0c94-7f42-df761e4facac@suse.de>
[-- Attachment #1.1: Type: text/plain, Size: 2859 bytes --]
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 features
> > (30 and 36 bits output, YUV output, etc.) will depend on a bunch of
> > connectors properties.
> >
> > Let's store the rate we have to run the pixel clock at in our custom
> > connector state, and compute it in atomic_check.
> >
> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > ---
> > drivers/gpu/drm/vc4/vc4_hdmi.c | 26 +++++++++++++++++++++++++-
> > drivers/gpu/drm/vc4/vc4_hdmi.h | 1 +
> > 2 files changed, 26 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.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_connector *connector)
> > if (!new_state)
> > return NULL;
> > + new_state->pixel_rate = 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 == encoder)
> > + return conn_state;
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
> > struct drm_atomic_state *state)
> > {
> > + struct drm_connector_state *conn_state =
> > + vc4_hdmi_encoder_get_connector_state(encoder, state);
> > + struct vc4_hdmi_connector_state *vc4_conn_state =
> > + conn_state_to_vc4_hdmi_conn_state(conn_state);
> > struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
> > struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
> > unsigned long pixel_rate, hsm_rate;
> > @@ -625,7 +646,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
> > return;
> > }
> > - pixel_rate = mode->clock * 1000 * ((mode->flags & DRM_MODE_FLAG_DBLCLK) ? 2 : 1);
>
> 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
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-07 15:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 13:39 [PATCH v4 0/8] drm/vc4: hdmi: Support the 10/12 bit output Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 1/8] drm/vc4: hvs: Align the HVS atomic hooks to the new API Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 2/8] drm/vc4: Pass the atomic state to encoder hooks Maxime Ripard
2020-12-07 14:16 ` Thomas Zimmermann
2020-12-07 15:56 ` Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 3/8] drm/vc4: hdmi: Don't access the connector state in reset if kmalloc fails Maxime Ripard
2020-12-07 14:05 ` Thomas Zimmermann
2020-12-07 13:39 ` [PATCH v4 4/8] drm/vc4: hdmi: Create a custom connector state Maxime Ripard
2020-12-07 14:07 ` Thomas Zimmermann
2020-12-07 13:39 ` [PATCH v4 5/8] drm/vc4: hdmi: Store pixel frequency in the " Maxime Ripard
2020-12-07 14:14 ` Thomas Zimmermann
2020-12-07 15:44 ` Maxime Ripard [this message]
2020-12-07 13:39 ` [PATCH v4 6/8] drm/vc4: hdmi: Use the connector state pixel rate for the PHY Maxime Ripard
2020-12-07 14:20 ` Thomas Zimmermann
2020-12-07 13:39 ` [PATCH v4 7/8] drm/vc4: hdmi: Limit the BCM2711 to the max without scrambling Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 8/8] drm/vc4: hdmi: Enable 10/12 bpc output Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201207154427.uvhhnwrtmwagas33@gilmour \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox