Commit 83f8bf4b authored Apr 16, 2019 by Thierry Reding

drm/tegra: hdmi: Setup audio only if configured



The audio configuration is only valid if the HDMI codec has been
properly set up. Do not attempt to set up audio before that happens
because it causes a division by zero.

Note that this is only problematic on Tegra20 and Tegra30. Later chips
implement the division instructions which return zero when dividing by
zero and don't throw an exception.

Fixes: db5adf4d ("drm/tegra: hdmi: Fix audio to work with any pixel clock rate")
Reported-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

parent 8bbad1ba

drivers/gpu/drm/tegra/hdmi.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -1260,10 +1260,16 @@ static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder)

		hdmi->dvi = !tegra_output_is_hdmi(output);
		if (!hdmi->dvi) {
		/*
		* Make sure that the audio format has been configured before
		* enabling audio, otherwise we may try to divide by zero.
		*/
		if (hdmi->format.sample_rate > 0) {
		err = tegra_hdmi_setup_audio(hdmi);
		if (err < 0)
		hdmi->dvi = true;
		}
		}

		if (hdmi->config->has_hda)
		tegra_hdmi_write_eld(hdmi);

Admin message