Unverified Commit fbe7271e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Create a custom connector state 



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.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215154243.540115-6-maxime@cerno.tech
parent e55a0775

drivers/gpu/drm/vc4/vc4_hdmi.c

+30 −3
Original line number Diff line number Diff line
@@ -170,18 +170,45 @@ 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 *old_state =

		conn_state_to_vc4_hdmi_conn_state(connector->state);

	struct vc4_hdmi_connector_state *new_state =

		kzalloc(sizeof(*new_state), GFP_KERNEL);



	if (connector->state)

		__drm_atomic_helper_connector_destroy_state(connector->state);



	kfree(old_state);

	__drm_atomic_helper_connector_reset(connector, &new_state->base);



	if (!new_state)

		return;



	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,

};

drivers/gpu/drm/vc4/vc4_hdmi.h

+10 −0
Original line number Diff line number Diff line
@@ -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);