From 68522ed7c1135fd5ea5b4541d557bdbdcba80669 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 8 Dec 2021 15:57:15 +0000 Subject: [PATCH] vc4/drm: Ignore vc4_hdmi->output_enabled for allowing audio (#4759) Otherwise we reject audio playback when switching hdmi modes Signed-off-by: Dom Cobley --- drivers/gpu/drm/vc4/vc4_hdmi.c | 29 ++--------------------------- drivers/gpu/drm/vc4/vc4_hdmi.h | 6 ------ 2 files changed, 2 insertions(+), 33 deletions(-) --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -211,6 +211,7 @@ vc4_hdmi_connector_detect(struct drm_con connected = true; } + vc4_hdmi->encoder.hdmi_monitor = false; if (connected) { if (connector->status != connector_status_connected) { struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc); @@ -731,15 +732,6 @@ static void vc4_hdmi_encoder_post_crtc_p mutex_unlock(&vc4_hdmi->mutex); } -static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder) -{ - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); - - mutex_lock(&vc4_hdmi->mutex); - vc4_hdmi->output_enabled = false; - mutex_unlock(&vc4_hdmi->mutex); -} - static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable) { unsigned long flags; @@ -1220,15 +1212,6 @@ static void vc4_hdmi_encoder_post_crtc_e mutex_unlock(&vc4_hdmi->mutex); } -static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) -{ - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); - - mutex_lock(&vc4_hdmi->mutex); - vc4_hdmi->output_enabled = true; - mutex_unlock(&vc4_hdmi->mutex); -} - static void vc4_hdmi_encoder_atomic_mode_set(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) @@ -1322,8 +1305,6 @@ static const struct drm_encoder_helper_f .atomic_check = vc4_hdmi_encoder_atomic_check, .atomic_mode_set = vc4_hdmi_encoder_atomic_mode_set, .mode_valid = vc4_hdmi_encoder_mode_valid, - .disable = vc4_hdmi_encoder_disable, - .enable = vc4_hdmi_encoder_enable, }; static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) @@ -1423,16 +1404,10 @@ static bool vc4_hdmi_audio_can_stream(st lockdep_assert_held(&vc4_hdmi->mutex); /* - * If the controller is disabled, prevent any ALSA output. - */ - if (!vc4_hdmi->output_enabled) - return false; - - /* * If the encoder is currently in DVI mode, treat the codec DAI * as missing. */ - if (!(HDMI_READ(HDMI_RAM_PACKET_CONFIG) & VC4_HDMI_RAM_PACKET_ENABLE)) + if (!vc4_hdmi->encoder.hdmi_monitor) return false; return true; --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -209,12 +209,6 @@ struct vc4_hdmi { struct drm_display_mode saved_adjusted_mode; /** - * @output_enabled: Is the HDMI controller currently active? - * Protected by @mutex. - */ - bool output_enabled; - - /** * @scdc_enabled: Is the HDMI controller currently running with * the scrambler on? Protected by @mutex. */