Commit 31ad37bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

This reverts commit 27da370e.

Sudip Mukherjee reports that this broke pulseaudio with a NULL pointer
dereference in vc4_hdmi_audio_prepare(), bisected it to this commit, and
confirmed that a revert fixed the problem.

Revert the problematic commit until fixed.

Link: https://lore.kernel.org/all/CADVatmPB9-oKd=ypvj25UYysVo6EZhQ6bCM7EvztQBMyiZfAyw@mail.gmail.com/
Link: https://lore.kernel.org/all/CADVatmN5EpRshGEPS_JozbFQRXg5w_8LFB3OMP1Ai-ghxd3w4g@mail.gmail.com/


Reported-and-tested-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Maxime Ripard <maxime@cerno.tech>
Cc: Emma Anholt <emma@anholt.net>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1044a9b

drivers/gpu/drm/vc4/vc4_hdmi.c

+13 −27
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 = cstate->crtc;

	struct drm_crtc *crtc = encoder->crtc;

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

	union hdmi_infoframe frame;

	int ret;
@@ -537,11 +537,8 @@ 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;
@@ -562,18 +559,17 @@ 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_connector *connector = &vc4_hdmi->connector;

	struct drm_connector_state *cstate = connector->state;

	struct drm_crtc *crtc = encoder->crtc;



	/*

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

	 * At boot, encoder->crtc 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 (cstate && !vc4_hdmi_supports_scrambling(encoder, &cstate->crtc->mode))

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

		return;



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

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

		return;



	if (delayed_work_pending(&vc4_hdmi->scrambling_work))
@@ -895,9 +891,7 @@ 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_crtc_state *crtc_state =

		drm_atomic_get_new_crtc_state(state, conn_state->crtc);

	struct drm_display_mode *mode = &crtc_state->adjusted_mode;

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

	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);

	unsigned long bvb_rate, pixel_rate, hsm_rate;

	int ret;
@@ -991,11 +985,7 @@ 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_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 drm_display_mode *mode = &encoder->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);
@@ -1018,11 +1008,7 @@ 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_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 drm_display_mode *mode = &encoder->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;
@@ -1210,8 +1196,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, unsigned int samplerate)

{

	struct drm_connector *connector = &vc4_hdmi->connector;

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

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

	struct drm_crtc *crtc = encoder->crtc;

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

	u32 n, cts;

	u64 tmp;
@@ -1244,13 +1230,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_connector *connector = &vc4_hdmi->connector;

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



	/*

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

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

	 */

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

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

				VC4_HDMI_RAM_PACKET_ENABLE))

		return -ENODEV;