| Message ID | 1401350359-5045-1-git-send-email-hui.wang@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 37df09492c3315c4824e53ebcea781c114be9f41 |
| Headers | show |
At Thu, 29 May 2014 15:59:17 +0800, Hui Wang wrote: > > This reverts commit c687200b9d4ef60042a50f7d942cfef120cc7bf1. > > Dropping the def association and sequence from pinconf comparing is a > bit risky, It will introduce a greater risk of catching unwanted > machines. > > And in addition, so far no BIOS experts give us an explicit answer > whether it makes senses to compare these two fields or not. > > For safety reason, we revert this commit. > > Signed-off-by: Hui Wang <hui.wang@canonical.com> > --- > This is the first attempt to move existing machines from old quirk table > to hda_pin_quirk table. During the working, I met serveral cases that > the same codec has different default pin conf value just because of > default association difference, Please see the following two patches > (0x10ec0255 and 0x10ec0668). OK, applied all three patches now. thanks, Takashi > > > sound/pci/hda/hda_auto_parser.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c > index 3cf9137..b684c6e 100644 > --- a/sound/pci/hda/hda_auto_parser.c > +++ b/sound/pci/hda/hda_auto_parser.c > @@ -844,8 +844,7 @@ static bool pin_config_match(struct hda_codec *codec, > { > for (; pins->nid; pins++) { > u32 def_conf = snd_hda_codec_get_pincfg(codec, pins->nid); > - u32 mask = 0xffffff00; > - if ((pins->val & mask) != (def_conf & mask)) > + if (pins->val != def_conf) > return false; > } > return true; > -- > 1.8.1.2 >
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 3cf9137..b684c6e 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -844,8 +844,7 @@ static bool pin_config_match(struct hda_codec *codec, { for (; pins->nid; pins++) { u32 def_conf = snd_hda_codec_get_pincfg(codec, pins->nid); - u32 mask = 0xffffff00; - if ((pins->val & mask) != (def_conf & mask)) + if (pins->val != def_conf) return false; } return true;
This reverts commit c687200b9d4ef60042a50f7d942cfef120cc7bf1. Dropping the def association and sequence from pinconf comparing is a bit risky, It will introduce a greater risk of catching unwanted machines. And in addition, so far no BIOS experts give us an explicit answer whether it makes senses to compare these two fields or not. For safety reason, we revert this commit. Signed-off-by: Hui Wang <hui.wang@canonical.com> --- This is the first attempt to move existing machines from old quirk table to hda_pin_quirk table. During the working, I met serveral cases that the same codec has different default pin conf value just because of default association difference, Please see the following two patches (0x10ec0255 and 0x10ec0668). sound/pci/hda/hda_auto_parser.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)