Re: [PATCH v4 5/8] drm/vc4: hdmi: Store pixel frequency in the connector state

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