diff options
| author | Thierry Reding <treding@nvidia.com> | 2019-04-16 14:43:26 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2019-04-17 09:28:43 +0200 |
| commit | 83f8bf4b837b0e3417f0e5c717a43fcf71ecc992 (patch) | |
| tree | 4fcc40792ec0395a5796c1cd4d51e516cc211ea4 /drivers/gpu/drm/tegra | |
| parent | 8bbad1ba3196814487438d1299cec75de5c74615 (diff) | |
| download | linux-83f8bf4b837b0e3417f0e5c717a43fcf71ecc992.tar.gz linux-83f8bf4b837b0e3417f0e5c717a43fcf71ecc992.tar.bz2 linux-83f8bf4b837b0e3417f0e5c717a43fcf71ecc992.zip | |
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: db5adf4d6dce ("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>
Diffstat (limited to 'drivers/gpu/drm/tegra')
| -rw-r--r-- | drivers/gpu/drm/tegra/hdmi.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 47c55974756d..d23c4bfde790 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1260,9 +1260,15 @@ static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder) hdmi->dvi = !tegra_output_is_hdmi(output); if (!hdmi->dvi) { - err = tegra_hdmi_setup_audio(hdmi); - if (err < 0) - hdmi->dvi = true; + /* + * 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) |