This is a note to let you know that I've just added the patch titled
drm/i915/hdmi: fix hdmi audio state readout
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-hdmi-fix-hdmi-audio-state-readout.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c84db77010877da6c5da119868ed54c43d59e726 Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@xxxxxxxxx>
Date: Wed, 17 Sep 2014 15:34:58 +0300
Subject: drm/i915/hdmi: fix hdmi audio state readout
From: Jani Nikula <jani.nikula@xxxxxxxxx>
commit c84db77010877da6c5da119868ed54c43d59e726 upstream.
Check the correct bit for audio. Seems like a copy-paste error from the
start:
commit 9ed109a7b445e3f073d8ea72f888ec80c0532465
Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
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@xxxxxxxxx>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82756
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -728,7 +728,7 @@ static void intel_hdmi_get_config(struct
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;
pipe_config->adjusted_mode.flags |= flags;
Patches currently in stable-queue which might be from jani.nikula@xxxxxxxxx are
queue-3.16/drm-i915-fix-eio-wedged-handling-in-gem-fault-handler.patch
queue-3.16/drm-i915-remove-bogus-__init-annotation-from-dmi-callbacks.patch
queue-3.16/drm-i915-ignore-vbt-backlight-presence-check-on-acer-c720-4005u.patch
queue-3.16/drm-i915-don-t-leak-command-parser-tables-on-suspend-resume.patch
queue-3.16/drm-i915-skip-load-detect-when-intel_crtc-new_enable-true.patch
queue-3.16/drm-i915-wait-for-vblank-before-enabling-the-tv-encoder.patch
queue-3.16/drm-i915-fix-lock-dropping-in-intel_tv_detect.patch
queue-3.16/drm-i915-don-t-try-to-retrain-a-dp-link-on-an-inactive-crtc.patch
queue-3.16/drm-i915-fix-locking-for-intel_enable_pipe_a.patch
queue-3.16/drm-i915-fix-plane-cursor-handling-when-runtime-suspended.patch
queue-3.16/drm-i915-hdmi-fix-hdmi-audio-state-readout.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html