From ce2e9a84924d7498837cf95c720c05a4af1ed79b Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Fri, 11 Dec 2009 12:28:33 +0800 Subject: [PATCH] --- yaml --- r: 175693 b: refs/heads/master c: b923528ed29dc2d12832f76b1b9e05848d9de853 h: refs/heads/master i: 175691: 11be7c48533163262b08a9907405fe0c6eebcd3c v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.h | 1 + trunk/sound/pci/hda/hda_proc.c | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bdab288ce836..3ab279509d41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c357aab02ee8de1f833579861ebd1e5683d2e806 +refs/heads/master: b923528ed29dc2d12832f76b1b9e05848d9de853 diff --git a/trunk/sound/pci/hda/hda_codec.h b/trunk/sound/pci/hda/hda_codec.h index 2d627613aea3..f9a084a1378e 100644 --- a/trunk/sound/pci/hda/hda_codec.h +++ b/trunk/sound/pci/hda/hda_codec.h @@ -258,6 +258,7 @@ enum { #define AC_PINCAP_VREF (0x37<<8) #define AC_PINCAP_VREF_SHIFT 8 #define AC_PINCAP_EAPD (1<<16) /* EAPD capable */ +#define AC_PINCAP_HBR (1<<27) /* High Bit Rate */ /* Vref status (used in pin cap) */ #define AC_PINCAP_VREF_HIZ (1<<0) /* Hi-Z */ #define AC_PINCAP_VREF_50 (1<<1) /* 50% */ diff --git a/trunk/sound/pci/hda/hda_proc.c b/trunk/sound/pci/hda/hda_proc.c index 09476fc1ab64..8d381c891001 100644 --- a/trunk/sound/pci/hda/hda_proc.c +++ b/trunk/sound/pci/hda/hda_proc.c @@ -240,8 +240,11 @@ static void print_pin_caps(struct snd_info_buffer *buffer, /* Realtek uses this bit as a different meaning */ if ((codec->vendor_id >> 16) == 0x10ec) snd_iprintf(buffer, " R/L"); - else + else { + if (caps & AC_PINCAP_HBR) + snd_iprintf(buffer, " HBR"); snd_iprintf(buffer, " HDMI"); + } } if (caps & AC_PINCAP_TRIG_REQ) snd_iprintf(buffer, " Trigger");