Skip to content

Commit

Permalink
drm/i915/hdmi: fix hdmi audio state readout
Browse files Browse the repository at this point in the history
Check the correct bit for audio. Seems like a copy-paste error from the
start:

commit 9ed109a
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Apr 24 23:54:52 2014 +0200

    drm/i915: Track has_audio in the pipe config

Reported-by: Martin Andersen <martin.x.andersen@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82756
Cc: stable@vger.kernel.org # 3.16+
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Jani Nikula committed Sep 23, 2014
1 parent 22cb99a commit c84db77
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
if (tmp & HDMI_MODE_SELECT_HDMI)
pipe_config->has_hdmi_sink = true;

if (tmp & HDMI_MODE_SELECT_HDMI)
if (tmp & SDVO_AUDIO_ENABLE)
pipe_config->has_audio = true;

if (!HAS_PCH_SPLIT(dev) &&
Expand Down

0 comments on commit c84db77

Please sign in to comment.