intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Wang Xingchao <xingchao.wang@linux.intel.com>
To: tiwai@suse.de, daniel.vetter@ffwll.ch
Cc: alsa-devel@alsa-project.org, xingchao.wang@intel.com,
	Wang Xingchao <xingchao.wang@linux.intel.com>,
	intel-gfx@lists.freedesktop.org, david.henningsson@canonical.com
Subject: [PATCH 2/4] ALSA: hda - Return error when open empty hdmi device
Date: Fri, 14 Jun 2013 23:20:27 +0800	[thread overview]
Message-ID: <1371223229-8236-3-git-send-email-xingchao.wang@linux.intel.com> (raw)
In-Reply-To: <1371223229-8236-1-git-send-email-xingchao.wang@linux.intel.com>

when user open HDMI device 3/7/8, if it has no physical device
connected, return error.
The bug is from Haswell platform, All pins choose converter 0 by default
in hardware level, maybe only pin 1 had valid monitor connected. if user
play audio on pin 0/2, pin 1 can get audio data too.

Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
---
 sound/pci/hda/patch_hdmi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 8db5eb6..d766f40 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1139,6 +1139,9 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
 	per_pin = get_pin(spec, pin_idx);
 	eld = &per_pin->sink_eld;
 
+	if (!eld->monitor_present || !eld->eld_valid)
+		return -EIO;
+
 	if (codec->vendor_id == 0x80862807)
 		hsw_verify_cvt_D0(spec, codec);
 		
-- 
1.8.1.2

  parent reply	other threads:[~2013-06-14 15:20 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-14 15:20 [PATCH 0/4] Haswell Display audio routing bug fix Wang Xingchao
2013-06-14 15:20 ` [PATCH 1/4] ALSA: hda - Haswell converter power state D0 verify Wang Xingchao
2013-06-17  9:00   ` Takashi Iwai
2013-06-17 11:55     ` Wang, Xingchao
2013-06-14 15:20 ` Wang Xingchao [this message]
2013-06-17  8:23   ` [PATCH 2/4] ALSA: hda - Return error when open empty hdmi device David Henningsson
2013-06-17 11:54     ` Wang, Xingchao
2013-06-17 12:15       ` David Henningsson
2013-06-17 12:25         ` Wang, Xingchao
2013-06-18  3:23         ` Wang, Xingchao
2013-06-14 15:20 ` [PATCH 3/4] drm/i915: Add display audio routing APIs for ALSA Wang Xingchao
2013-06-14 19:18   ` Daniel Vetter
2013-06-17 12:52     ` Wang, Xingchao
2013-06-18  7:13       ` Daniel Vetter
2013-06-18  9:04         ` Wang, Xingchao
2013-06-14 15:20 ` [PATCH 4/4] ALSA: hda - Add display audio routing API for haswell Wang Xingchao
2013-06-17  9:03   ` Takashi Iwai
2013-06-17 12:53     ` Wang, Xingchao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371223229-8236-3-git-send-email-xingchao.wang@linux.intel.com \
    --to=xingchao.wang@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=david.henningsson@canonical.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=tiwai@suse.de \
    --cc=xingchao.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).