[PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[libin.yang]

From: Libin Yang <libin.yang@intel.com>

Add HD Audio Device PCI ID for the Intel Braswell platform.

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 sound/pci/hda/hda_intel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 387fc73..5db1948 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
 	/* BayTrail */
 	{ PCI_DEVICE(0x8086, 0x0f04),
 	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	/* Braswell */
+	{ PCI_DEVICE(0x8086, 0x2284),
+	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
 	/* ICH */
 	{ PCI_DEVICE(0x8086, 0x2668),
 	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
-- 
1.9.1

[PATCH 2/2] ALSA: hda - add codec ID for Braswell display audio codec

[libin.yang]

From: Libin Yang <libin.yang@intel.com>

This patch adds codec ID (0x80862883) and module alias for Braswell
display codec.

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 sound/pci/hda/patch_hdmi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index a21090b..36badba 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -3356,6 +3356,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x80862808, .name = "Broadwell HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862880, .name = "CedarTrail HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862882, .name = "Valleyview2 HDMI",	.patch = patch_generic_hdmi },
+{ .id = 0x80862883, .name = "Braswell HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x808629fb, .name = "Crestline HDMI",	.patch = patch_generic_hdmi },
 {} /* terminator */
 };
@@ -3415,6 +3416,7 @@ MODULE_ALIAS("snd-hda-codec-id:80862807");
 MODULE_ALIAS("snd-hda-codec-id:80862808");
 MODULE_ALIAS("snd-hda-codec-id:80862880");
 MODULE_ALIAS("snd-hda-codec-id:80862882");
+MODULE_ALIAS("snd-hda-codec-id:80862883");
 MODULE_ALIAS("snd-hda-codec-id:808629fb");
 
 MODULE_LICENSE("GPL");
-- 
1.9.1

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Takashi Iwai]

At Fri, 25 Jul 2014 16:19:15 +0800,
libin.yang@intel.com wrote:
> 
> From: Libin Yang <libin.yang@intel.com>
> 
> Add HD Audio Device PCI ID for the Intel Braswell platform.

So, you confirmed that runtime PM works?  Also, the device doesn't
need the buffer size alignment unlike Haswell & co?  If these were
already confirmed, describe in the patch description (also mention
that it's an HDMI controller).


Takashi

> 
> Signed-off-by: Libin Yang <libin.yang@intel.com>
> ---
>  sound/pci/hda/hda_intel.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 387fc73..5db1948 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
>  	/* BayTrail */
>  	{ PCI_DEVICE(0x8086, 0x0f04),
>  	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	/* Braswell */
> +	{ PCI_DEVICE(0x8086, 0x2284),
> +	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>  	/* ICH */
>  	{ PCI_DEVICE(0x8086, 0x2668),
>  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
> -- 
> 1.9.1
> 

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Yang, Libin]

Hi Takashi,

Please see my comments below

> -----Original Message-----
> From: Takashi Iwai [mailto:tiwai@suse.de]
> Sent: Friday, July 25, 2014 4:31 PM
> To: Yang, Libin
> Cc: alsa-devel@alsa-project.org; Lin, Mengdong
> Subject: Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell
> 
> At Fri, 25 Jul 2014 16:19:15 +0800,
> libin.yang@intel.com wrote:
> >
> > From: Libin Yang <libin.yang@intel.com>
> >
> > Add HD Audio Device PCI ID for the Intel Braswell platform.
> 
> So, you confirmed that runtime PM works?  Also, the device doesn't need
> the buffer size alignment unlike Haswell & co?  If these were already
> confirmed, describe in the patch description (also mention that it's an HDMI
> controller).
> 

Yes, I have tested the runtime PM, and it works. Besides, I think you are right, if the HDMI codec doesn't support, we should leave it to codec to decide not to use the runtime PM.

For the buffer size alignment, I will confirm with our HW team. Thanks for reminding me.

I will add the comments in the patch description. 

BTW: this is not a HDMI audio controller. The HDMI codec and analog codec will both connect to the controller. It's not embedded into the HDMI controller. 


> 
> Takashi
> 
> >
> > Signed-off-by: Libin Yang <libin.yang@intel.com>
> > ---
> >  sound/pci/hda/hda_intel.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > index 387fc73..5db1948 100644
> > --- a/sound/pci/hda/hda_intel.c
> > +++ b/sound/pci/hda/hda_intel.c
> > @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
> >  	/* BayTrail */
> >  	{ PCI_DEVICE(0x8086, 0x0f04),
> >  	  .driver_data = AZX_DRIVER_PCH |
> AZX_DCAPS_INTEL_PCH_NOPM },
> > +	/* Braswell */
> > +	{ PCI_DEVICE(0x8086, 0x2284),
> > +	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> >  	/* ICH */
> >  	{ PCI_DEVICE(0x8086, 0x2668),
> >  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
> > --
> > 1.9.1
> >

[PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[libin.yang]

From: Libin Yang <libin.yang@intel.com>

Add HD Audio Device PCI ID for the Intel Braswell platform.
It is an HDA Intel PCH controller.

AZX_DCAPS_ALIGN_BUFSIZE is not necessary for this controller.

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 sound/pci/hda/hda_intel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 387fc73..5db1948 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
 	/* BayTrail */
 	{ PCI_DEVICE(0x8086, 0x0f04),
 	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	/* Braswell */
+	{ PCI_DEVICE(0x8086, 0x2284),
+	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
 	/* ICH */
 	{ PCI_DEVICE(0x8086, 0x2668),
 	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
-- 
1.9.1

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Takashi Iwai]

At Mon,  4 Aug 2014 09:22:44 +0800,
libin.yang@intel.com wrote:
> 
> From: Libin Yang <libin.yang@intel.com>
> 
> Add HD Audio Device PCI ID for the Intel Braswell platform.
> It is an HDA Intel PCH controller.
> 
> AZX_DCAPS_ALIGN_BUFSIZE is not necessary for this controller.
> 
> Signed-off-by: Libin Yang <libin.yang@intel.com>

Thanks, applied both patches.


Takashi

> ---
>  sound/pci/hda/hda_intel.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 387fc73..5db1948 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
>  	/* BayTrail */
>  	{ PCI_DEVICE(0x8086, 0x0f04),
>  	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	/* Braswell */
> +	{ PCI_DEVICE(0x8086, 0x2284),
> +	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>  	/* ICH */
>  	{ PCI_DEVICE(0x8086, 0x2668),
>  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
> -- 
> 1.9.1
> 

[PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[libin.yang]

From: Libin Yang <libin.yang@intel.com>

Add HD Audio Device PCI ID for the Intel Braswell platform.

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 sound/pci/hda/hda_intel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 387fc73..f758729 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
 	/* BayTrail */
 	{ PCI_DEVICE(0x8086, 0x0f04),
 	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	/* Braswell */
+	{ PCI_DEVICE(0x8086, 0x2284),
+	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
 	/* ICH */
 	{ PCI_DEVICE(0x8086, 0x2668),
 	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
-- 
1.9.1

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Takashi Iwai]

At Wed, 23 Jul 2014 08:55:37 +0800,
libin.yang@intel.com wrote:
> 
> From: Libin Yang <libin.yang@intel.com>
> 
> Add HD Audio Device PCI ID for the Intel Braswell platform.
> 
> Signed-off-by: Libin Yang <libin.yang@intel.com>
> ---
>  sound/pci/hda/hda_intel.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 387fc73..f758729 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
>  	/* BayTrail */
>  	{ PCI_DEVICE(0x8086, 0x0f04),
>  	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	/* Braswell */
> +	{ PCI_DEVICE(0x8086, 0x2284),
> +	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },

Doesn't really this new chip support runtime PM?


Takashi

>  	/* ICH */
>  	{ PCI_DEVICE(0x8086, 0x2668),
>  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
> -- 
> 1.9.1
> 

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Yang, Libin]

Hi Takashi,

> -----Original Message-----
> From: Takashi Iwai [mailto:tiwai@suse.de]
> Sent: Wednesday, July 23, 2014 6:08 PM
> To: Yang, Libin
> Cc: alsa-devel@alsa-project.org; Lin, Mengdong
> Subject: Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell
> 
> At Wed, 23 Jul 2014 08:55:37 +0800,
> libin.yang@intel.com wrote:
> >
> > From: Libin Yang <libin.yang@intel.com>
> >
> > Add HD Audio Device PCI ID for the Intel Braswell platform.
> >
> > Signed-off-by: Libin Yang <libin.yang@intel.com>
> > ---
> >  sound/pci/hda/hda_intel.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > index 387fc73..f758729 100644
> > --- a/sound/pci/hda/hda_intel.c
> > +++ b/sound/pci/hda/hda_intel.c
> > @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
> >  	/* BayTrail */
> >  	{ PCI_DEVICE(0x8086, 0x0f04),
> >  	  .driver_data = AZX_DRIVER_PCH |
> AZX_DCAPS_INTEL_PCH_NOPM },
> > +	/* Braswell */
> > +	{ PCI_DEVICE(0x8086, 0x2284),
> > +	  .driver_data = AZX_DRIVER_PCH |
> AZX_DCAPS_INTEL_PCH_NOPM },
> 
> Doesn't really this new chip support runtime PM?

Braswell is more like Baytrail, which doesn't support runtime PM. 

Anyway, I will test the pm-runtime on braswell and update the result later.

> 
> 
> Takashi
> 
> >  	/* ICH */
> >  	{ PCI_DEVICE(0x8086, 0x2668),
> >  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
> > --
> > 1.9.1
> >

Regards,
Libin

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Yang, Libin]

Hi Takashi,

After checking the HW, the HDMI audio codec doesn't support EPSS. If we force it to support runtime PM, there is risk. Besides, as the codec doesn't support EPSS, if we want to support runtime PM, simply add the AZX_DCAPS_PM_RUNTIME flag doesn't help. We must think out a method to ensure the driver enter pm runtime even the codec doesn't support.

What do you think whether we can merge the patch firstly, and on the meantime, I will ask our QA team to do a full test with pm runtime enabled and decide the next step?


Regards,
Libin

> -----Original Message-----
> From: Yang, Libin
> Sent: Thursday, July 24, 2014 11:57 AM
> To: Takashi Iwai
> Cc: alsa-devel@alsa-project.org; Lin, Mengdong
> Subject: RE: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell
> 
> Hi Takashi,
> 
> > -----Original Message-----
> > From: Takashi Iwai [mailto:tiwai@suse.de]
> > Sent: Wednesday, July 23, 2014 6:08 PM
> > To: Yang, Libin
> > Cc: alsa-devel@alsa-project.org; Lin, Mengdong
> > Subject: Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell
> >
> > At Wed, 23 Jul 2014 08:55:37 +0800,
> > libin.yang@intel.com wrote:
> > >
> > > From: Libin Yang <libin.yang@intel.com>
> > >
> > > Add HD Audio Device PCI ID for the Intel Braswell platform.
> > >
> > > Signed-off-by: Libin Yang <libin.yang@intel.com>
> > > ---
> > >  sound/pci/hda/hda_intel.c | 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > > index 387fc73..f758729 100644
> > > --- a/sound/pci/hda/hda_intel.c
> > > +++ b/sound/pci/hda/hda_intel.c
> > > @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = {
> > >  	/* BayTrail */
> > >  	{ PCI_DEVICE(0x8086, 0x0f04),
> > >  	  .driver_data = AZX_DRIVER_PCH |
> > AZX_DCAPS_INTEL_PCH_NOPM },
> > > +	/* Braswell */
> > > +	{ PCI_DEVICE(0x8086, 0x2284),
> > > +	  .driver_data = AZX_DRIVER_PCH |
> > AZX_DCAPS_INTEL_PCH_NOPM },
> >
> > Doesn't really this new chip support runtime PM?
> 
> Braswell is more like Baytrail, which doesn't support runtime PM.
> 
> Anyway, I will test the pm-runtime on braswell and update the result later.
> 
> >
> >
> > Takashi
> >
> > >  	/* ICH */
> > >  	{ PCI_DEVICE(0x8086, 0x2668),
> > >  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
> > > --
> > > 1.9.1
> > >
> 
> Regards,
> Libin

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Takashi Iwai]

At Thu, 24 Jul 2014 12:59:55 +0000,
Yang, Libin wrote:
> 
> Hi Takashi,
> 
> After checking the HW, the HDMI audio codec doesn't support EPSS. If we force it to support runtime PM, there is risk. Besides, as the codec doesn't support EPSS, if we want to support runtime PM, simply add the AZX_DCAPS_PM_RUNTIME flag doesn't help. We must think out a method to ensure the driver enter pm runtime even the codec doesn't support.

Wait, is the controller for the generic codecs or dedicated to the
embedded HDMI?  In the latter case, AZX_DCAPS_INTEL_PCM_NOPM is anyway
wrong.  For HDMI, we use different flags.


Takashi

Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell

[Yang, Libin]

Hi Takashi,

> -----Original Message-----
> From: Takashi Iwai [mailto:tiwai@suse.de]
> Sent: Thursday, July 24, 2014 9:21 PM
> To: Yang, Libin
> Cc: 'alsa-devel@alsa-project.org'; Lin, Mengdong
> Subject: Re: [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell
> 
> At Thu, 24 Jul 2014 12:59:55 +0000,
> Yang, Libin wrote:
> >
> > Hi Takashi,
> >
> > After checking the HW, the HDMI audio codec doesn't support EPSS. If we
> force it to support runtime PM, there is risk. Besides, as the codec doesn't
> support EPSS, if we want to support runtime PM, simply add the
> AZX_DCAPS_PM_RUNTIME flag doesn't help. We must think out a method
> to ensure the driver enter pm runtime even the codec doesn't support.
> 
> Wait, is the controller for the generic codecs or dedicated to the embedded
> HDMI?  In the latter case, AZX_DCAPS_INTEL_PCM_NOPM is anyway wrong.
> For HDMI, we use different flags.

OK, I see. I will add the flags and have a test.

> 
> 
> Takashi