[Intel-gfx] [PATCH] drm/i915/hdmi: fix hdmi audio state readout
Daniel Vetter
daniel at ffwll.ch
Wed Sep 17 17:55:31 CEST 2014
On Wed, Sep 17, 2014 at 03:34:58PM +0300, Jani Nikula wrote:
> Check the correct bit for audio. Seems like a copy-paste error from the
> start:
>
> commit 9ed109a7b445e3f073d8ea72f888ec80c0532465
> Author: Daniel Vetter <daniel.vetter at 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 at gmail.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82756
> Cc: stable at vger.kernel.org # 3.16+
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
Oops, indeed.
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 1f6130363889..29ec1535992d 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -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) &&
> --
> 2.0.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
More information about the Intel-gfx
mailing list