| Message ID | 1418707054-22891-1-git-send-email-libin.yang@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 432ac1a2c028acb289d90f918e3a7b79e4ac8c07 |
| Headers | show |
At Tue, 16 Dec 2014 13:17:34 +0800, libin.yang@intel.com wrote: > > From: Libin Yang <libin.yang@intel.com> > > Skylake and Haswell have the same behavior on display audio. So this patch > applys Haswell fix-ups to Skylake. > > Signed-off-by: Libin Yang <libin.yang@intel.com> Applied, thanks. Takashi > --- > sound/pci/hda/patch_hdmi.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > index 95129c2..5f13d2d 100644 > --- a/sound/pci/hda/patch_hdmi.c > +++ b/sound/pci/hda/patch_hdmi.c > @@ -47,7 +47,9 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); > > #define is_haswell(codec) ((codec)->vendor_id == 0x80862807) > #define is_broadwell(codec) ((codec)->vendor_id == 0x80862808) > -#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec)) > +#define is_skylake(codec) ((codec)->vendor_id == 0x80862809) > +#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \ > + || is_skylake(codec)) > > #define is_valleyview(codec) ((codec)->vendor_id == 0x80862882) > #define is_cherryview(codec) ((codec)->vendor_id == 0x80862883) > -- > 1.9.1 >
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 95129c2..5f13d2d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -47,7 +47,9 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); #define is_haswell(codec) ((codec)->vendor_id == 0x80862807) #define is_broadwell(codec) ((codec)->vendor_id == 0x80862808) -#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec)) +#define is_skylake(codec) ((codec)->vendor_id == 0x80862809) +#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \ + || is_skylake(codec)) #define is_valleyview(codec) ((codec)->vendor_id == 0x80862882) #define is_cherryview(codec) ((codec)->vendor_id == 0x80862883)