Re: [PATCH v4 4/8] drm/vc4: hdmi: Create a custom connector state

Am 07.12.20 um 14:39 schrieb Maxime Ripard:

When run with a higher bpc than 8, the clock of the HDMI controller needs to be adjusted. Let's create a connector state that will be used at atomic_check and atomic_enable to compute and store the clock rate associated to the state.

Signed-off-by: Maxime Ripard maxime@cerno.tech

Acked-by: Thomas Zimmermann tzimmermann@suse.de

---

drivers/gpu/drm/vc4/vc4_hdmi.c | 27 +++++++++++++++++++++++++-- drivers/gpu/drm/vc4/vc4_hdmi.h | 10 ++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 112c09873eb4..862c93708e9a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -170,18 +170,41 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)

static void vc4_hdmi_connector_reset(struct drm_connector *connector) {

• drm_atomic_helper_connector_reset(connector);

• struct vc4_hdmi_connector_state *conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);

• if (connector->state)

• __drm_atomic_helper_connector_destroy_state(connector->state);
  

• kfree(connector->state);

• __drm_atomic_helper_connector_reset(connector, &conn_state->base);

  if (connector->state) drm_atomic_helper_connector_tv_reset(connector); }

+static struct drm_connector_state * +vc4_hdmi_connector_duplicate_state(struct drm_connector *connector) +{

• struct drm_connector_state *conn_state = connector->state;
• struct vc4_hdmi_connector_state *vc4_state = conn_state_to_vc4_hdmi_conn_state(conn_state);
• struct vc4_hdmi_connector_state *new_state;
• new_state = kzalloc(sizeof(*new_state), GFP_KERNEL);
• if (!new_state)

• return NULL;
  

• __drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
• return &new_state->base;

+}

• static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { .detect = vc4_hdmi_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = vc4_hdmi_connector_destroy, .reset = vc4_hdmi_connector_reset,

• .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

• .atomic_duplicate_state = vc4_hdmi_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, };

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h index 0526a9cf608a..2cf5362052e2 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -180,6 +180,16 @@ encoder_to_vc4_hdmi(struct drm_encoder *encoder) return container_of(_encoder, struct vc4_hdmi, encoder); }

+struct vc4_hdmi_connector_state {

• struct drm_connector_state base;

+};

+static inline struct vc4_hdmi_connector_state * +conn_state_to_vc4_hdmi_conn_state(struct drm_connector_state *conn_state) +{

• return container_of(conn_state, struct vc4_hdmi_connector_state, base);

+}

• void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, struct drm_display_mode *mode); void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi);