diff options
| author | Guneshwor Singh <guneshwor.o.singh@intel.com> | 2017-12-07 07:36:20 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-07 07:42:28 -0500 |
| commit | 2b4584d00a6bc02b63ab3c7213060d41a74bdff1 (patch) | |
| tree | e284155ac2737384820aba5975c3ab631c042eaf | |
| parent | 866f7ed7d67936dcdbcddc111c8af878c918fe7c (diff) | |
ALSA: hda - Add vendor id for Cannonlake HDMI codec
Cannonlake HDMI codec has the same nid as Geminilake. This adds the
codec entry for it.
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index c19c81d230bd..b4f1b6e88305 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
| @@ -55,10 +55,11 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); | |||
| 55 | #define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b) | 55 | #define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b) |
| 56 | #define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \ | 56 | #define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \ |
| 57 | ((codec)->core.vendor_id == 0x80862800)) | 57 | ((codec)->core.vendor_id == 0x80862800)) |
| 58 | #define is_cannonlake(codec) ((codec)->core.vendor_id == 0x8086280c) | ||
| 58 | #define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \ | 59 | #define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \ |
| 59 | || is_skylake(codec) || is_broxton(codec) \ | 60 | || is_skylake(codec) || is_broxton(codec) \ |
| 60 | || is_kabylake(codec)) || is_geminilake(codec) | 61 | || is_kabylake(codec)) || is_geminilake(codec) \ |
| 61 | 62 | || is_cannonlake(codec) | |
| 62 | #define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882) | 63 | #define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882) |
| 63 | #define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883) | 64 | #define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883) |
| 64 | #define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec)) | 65 | #define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec)) |
| @@ -3841,6 +3842,7 @@ HDA_CODEC_ENTRY(0x80862808, "Broadwell HDMI", patch_i915_hsw_hdmi), | |||
| 3841 | HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI", patch_i915_hsw_hdmi), | 3842 | HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI", patch_i915_hsw_hdmi), |
| 3842 | HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi), | 3843 | HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi), |
| 3843 | HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi), | 3844 | HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi), |
| 3845 | HDA_CODEC_ENTRY(0x8086280c, "Cannonlake HDMI", patch_i915_glk_hdmi), | ||
| 3844 | HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi), | 3846 | HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi), |
| 3845 | HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI", patch_i915_glk_hdmi), | 3847 | HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI", patch_i915_glk_hdmi), |
| 3846 | HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), | 3848 | HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), |
