Unverified Commit 27da370e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Remove drm_encoder->crtc usage 



The drm_encoder crtc pointer isn't really fit for an atomic driver,
let's rely on the connector state instead.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210707141930.1811128-1-maxime@cerno.tech
parent 44fe9f90

drivers/gpu/drm/vc4/vc4_hdmi.c

+27 −13
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder) 
	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);

	struct drm_connector *connector = &vc4_hdmi->connector;

	struct drm_connector_state *cstate = connector->state;

	struct drm_crtc *crtc = encoder->crtc;

	struct drm_crtc *crtc = cstate->crtc;

	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;

	union hdmi_infoframe frame;

	int ret;
@@ -537,8 +537,11 @@ static bool vc4_hdmi_supports_scrambling(struct drm_encoder *encoder, 


static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder)

{

	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;

	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);

	struct drm_connector *connector = &vc4_hdmi->connector;

	struct drm_connector_state *cstate = connector->state;

	struct drm_crtc *crtc = cstate->crtc;

	struct drm_display_mode *mode = &crtc->state->adjusted_mode;



	if (!vc4_hdmi_supports_scrambling(encoder, mode))

		return;
@@ -559,17 +562,18 @@ static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder) 
static void vc4_hdmi_disable_scrambling(struct drm_encoder *encoder)

{

	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);

	struct drm_crtc *crtc = encoder->crtc;

	struct drm_connector *connector = &vc4_hdmi->connector;

	struct drm_connector_state *cstate = connector->state;



	/*

	 * At boot, encoder->crtc will be NULL. Since we don't know the

	 * At boot, connector->state will be NULL. Since we don't know the

	 * state of the scrambler and in order to avoid any

	 * inconsistency, let's disable it all the time.

	 */

	if (crtc && !vc4_hdmi_supports_scrambling(encoder, &crtc->mode))

	if (cstate && !vc4_hdmi_supports_scrambling(encoder, &cstate->crtc->mode))

		return;



	if (crtc && !vc4_hdmi_mode_needs_scrambling(&crtc->mode))

	if (cstate && !vc4_hdmi_mode_needs_scrambling(&cstate->crtc->mode))

		return;



	if (delayed_work_pending(&vc4_hdmi->scrambling_work))
@@ -891,7 +895,9 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, 
		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 drm_crtc_state *crtc_state =

		drm_atomic_get_new_crtc_state(state, conn_state->crtc);

	struct drm_display_mode *mode = &crtc_state->adjusted_mode;

	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);

	unsigned long bvb_rate, pixel_rate, hsm_rate;

	int ret;
@@ -985,7 +991,11 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, 
static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder,

					     struct drm_atomic_state *state)

{

	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;

	struct drm_connector_state *conn_state =

		vc4_hdmi_encoder_get_connector_state(encoder, state);

	struct drm_crtc_state *crtc_state =

		drm_atomic_get_new_crtc_state(state, conn_state->crtc);

	struct drm_display_mode *mode = &crtc_state->adjusted_mode;

	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);

	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
@@ -1008,7 +1018,11 @@ static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder, 
static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,

					      struct drm_atomic_state *state)

{

	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;

	struct drm_connector_state *conn_state =

		vc4_hdmi_encoder_get_connector_state(encoder, state);

	struct drm_crtc_state *crtc_state =

		drm_atomic_get_new_crtc_state(state, conn_state->crtc);

	struct drm_display_mode *mode = &crtc_state->adjusted_mode;

	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);

	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);

	bool hsync_pos = mode->flags & DRM_MODE_FLAG_PHSYNC;
@@ -1195,8 +1209,8 @@ static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi) 


static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi)

{

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_crtc *crtc = encoder->crtc;

	struct drm_connector *connector = &vc4_hdmi->connector;

	struct drm_crtc *crtc = connector->state->crtc;

	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;

	u32 samplerate = vc4_hdmi->audio.samplerate;

	u32 n, cts;
@@ -1230,13 +1244,13 @@ static inline struct vc4_hdmi *dai_to_hdmi(struct snd_soc_dai *dai) 
static int vc4_hdmi_audio_startup(struct device *dev, void *data)

{

	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_connector *connector = &vc4_hdmi->connector;



	/*

	 * If the HDMI encoder hasn't probed, or the encoder is

	 * currently in DVI mode, treat the codec dai as missing.

	 */

	if (!encoder->crtc || !(HDMI_READ(HDMI_RAM_PACKET_CONFIG) &

	if (!connector->state || !(HDMI_READ(HDMI_RAM_PACKET_CONFIG) &

				VC4_HDMI_RAM_PACKET_ENABLE))

		return -ENODEV;