proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-11-25 20:09:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/vc4: hdmi: Skip writes to disabled packet RAM

Browse Source 
This path actually occurs when audio is started during a hdmi mode set.
As the data will be written by vc4_hdmi_set_infoframes when packet RAM
is enabled again, don't treat as an error

Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Link: https://lore.kernel.org/r/20220613144800.326124-26-maxime@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
This commit is contained in:
Dom Cobley 2022-06-13 16:47:52 +02:00 committed by Maxime Ripard
parent 05954270bd
commit 4ae3d6c09d
No known key found for this signature in database
GPG Key ID: E3EF0D6F671851C5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/vc4/vc4_hdmi.c
View File

@ -602,7 +602,9 @@ static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder)
union hdmi_infoframe frame; union hdmi_infoframe frame;
memcpy(&frame.audio, audio, sizeof(*audio)); memcpy(&frame.audio, audio, sizeof(*audio));
vc4_hdmi_write_infoframe(encoder, &frame);
if (vc4_hdmi->packet_ram_enabled)
vc4_hdmi_write_infoframe(encoder, &frame);
} }
static void vc4_hdmi_set_hdr_infoframe(struct drm_encoder *encoder) static void vc4_hdmi_set_hdr_infoframe(struct drm_encoder *encoder)
@ -742,6 +744,8 @@ static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
mutex_lock(&vc4_hdmi->mutex); mutex_lock(&vc4_hdmi->mutex);
vc4_hdmi->packet_ram_enabled = false;
spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0); HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0);
@ -1352,6 +1356,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
VC4_HDMI_RAM_PACKET_ENABLE); VC4_HDMI_RAM_PACKET_ENABLE);
spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags); spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
vc4_hdmi->packet_ram_enabled = true;
vc4_hdmi_set_infoframes(encoder); vc4_hdmi_set_infoframes(encoder);
} }

6
drivers/gpu/drm/vc4/vc4_hdmi.h
View File

@ -212,6 +212,12 @@ struct vc4_hdmi {
*/ */
struct drm_display_mode saved_adjusted_mode; struct drm_display_mode saved_adjusted_mode;
/**
* @packet_ram_enabled: Is the HDMI controller packet RAM currently
* on? Protected by @mutex.
*/
bool packet_ram_enabled;
/** /**
* @scdc_enabled: Is the HDMI controller currently running with * @scdc_enabled: Is the HDMI controller currently running with
* the scrambler on? Protected by @mutex. * the scrambler on? Protected by @mutex.