[alsa-devel] [PATCH] ALSA: hda - Add hdmi id for a Geminilake variant

[Takashi Iwai]

On Wed, 12 Jul 2017 16:34:24 +0200,
Subhransu S. Prusty wrote:
> 
> Few GLK platform variants report a different vendor nid. Add it.

The patch also silently fixes the missing check of is_haswell_plus()
for 8086:280d chip.  Please either split the fix or write up properly
in the changelog.


thanks,

Takashi

> 
> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty at intel.com>
> ---
>  sound/pci/hda/patch_hdmi.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 76c85f08bea6..d549f35f39d3 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -53,9 +53,11 @@
>  #define is_skylake(codec) ((codec)->core.vendor_id == 0x80862809)
>  #define is_broxton(codec) ((codec)->core.vendor_id == 0x8086280a)
>  #define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b)
> +#define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \
> +				((codec)->core.vendor_id == 0x80862800))
>  #define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \
>  				|| is_skylake(codec) || is_broxton(codec) \
> -				|| is_kabylake(codec))
> +				|| is_kabylake(codec)) || is_geminilake(codec)
>  
>  #define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882)
>  #define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)
> @@ -3790,6 +3792,7 @@ static int patch_via_hdmi(struct hda_codec *codec)
>  HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI",	patch_i915_hsw_hdmi),
>  HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI",	patch_i915_hsw_hdmi),
>  HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI",	patch_i915_glk_hdmi),
> +HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI",	patch_i915_glk_hdmi),
>  HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",	patch_generic_hdmi),
>  HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI",	patch_i915_byt_hdmi),
>  HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI",	patch_i915_byt_hdmi),
> -- 
> 1.9.1
>