[PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

[PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

Position_fix quirks for specific machines now override the default
position_fix behavior for all HDA controllers.

BugLink: http://launchpad.net/bugs/465942
BugLink: http://launchpad.net/bugs/580749
BugLink: http://launchpad.net/bugs/587546

Signed-off-by: David Henningsson <david.henningsson@canonical.com>

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0001-ALSA-HDA-Correctly-apply-position_fix-quirks-for-ATI.patch --]
[-- Type: text/x-patch, Size: 1689 bytes --]

>From b36e71f568c26ab11909454c5bf8bc5d47dbf025 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Mon, 4 Oct 2010 12:02:14 +0200
Subject: [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

Position_fix quirks for specific machines now override the default
position_fix behavior for all HDA controllers.

BugLink: http://launchpad.net/bugs/465942
BugLink: http://launchpad.net/bugs/580749
BugLink: http://launchpad.net/bugs/587546

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/hda_intel.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 38b063e..5cbea85 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2315,14 +2315,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 		return fix;
 	}
 
-	/* Check VIA/ATI HD Audio Controller exist */
-	switch (chip->driver_type) {
-	case AZX_DRIVER_VIA:
-	case AZX_DRIVER_ATI:
-		/* Use link position directly, avoid any transfer problem. */
-		return POS_FIX_VIACOMBO;
-	}
-
 	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
 	if (q) {
 		printk(KERN_INFO
@@ -2331,6 +2323,15 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 		       q->value, q->subvendor, q->subdevice);
 		return q->value;
 	}
+
+	/* Check VIA/ATI HD Audio Controller exist */
+	switch (chip->driver_type) {
+	case AZX_DRIVER_VIA:
+	case AZX_DRIVER_ATI:
+		/* Use link position directly, avoid any transfer problem. */
+		return POS_FIX_VIACOMBO;
+	}
+
 	return POS_FIX_AUTO;
 }
 
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

On 2010-10-04 12:15, David Henningsson wrote:
> Position_fix quirks for specific machines now override the default
> position_fix behavior for all HDA controllers.
>
> BugLink: http://launchpad.net/bugs/465942
> BugLink: http://launchpad.net/bugs/580749
> BugLink: http://launchpad.net/bugs/587546
>
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>

...and here's the version for 2.6.35 and 2.6.32 stable trees.

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0001-ALSA-HDA-Correctly-apply-position_fix-quirks-for-ATI.patch --]
[-- Type: text/x-patch, Size: 1998 bytes --]

>From 693810d675f1923449d7d38893a614c975bd359c Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Mon, 4 Oct 2010 13:13:44 +0200
Subject: [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

BugLink: http://launchpad.net/bugs/465942
BugLink: http://launchpad.net/bugs/580749
BugLink: http://launchpad.net/bugs/587546

Position_fix quirks for specific machines now override the default
position_fix behavior for all HDA controllers.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/hda_intel.c |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 741ad32..51b088e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2264,12 +2264,24 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 {
 	const struct snd_pci_quirk *q;
 
+	chip->via_dmapos_patch = 0;
+
 	switch (fix) {
 	case POS_FIX_LPIB:
 	case POS_FIX_POSBUF:
 		return fix;
 	}
 
+	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
+	if (q) {
+		/* Note that this implicitly sets via_dmapos_patch to zero */
+		printk(KERN_INFO
+		       "hda_intel: position_fix set to %d "
+		       "for device %04x:%04x\n",
+		       q->value, q->subvendor, q->subdevice);
+		return q->value;
+	}
+
 	/* Check VIA/ATI HD Audio Controller exist */
 	switch (chip->driver_type) {
 	case AZX_DRIVER_VIA:
@@ -2278,16 +2290,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 		/* Use link position directly, avoid any transfer problem. */
 		return POS_FIX_LPIB;
 	}
-	chip->via_dmapos_patch = 0;
 
-	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
-	if (q) {
-		printk(KERN_INFO
-		       "hda_intel: position_fix set to %d "
-		       "for device %04x:%04x\n",
-		       q->value, q->subvendor, q->subdevice);
-		return q->value;
-	}
 	return POS_FIX_AUTO;
 }
 
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [stable] [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

[Greg KH]

On Mon, Oct 04, 2010 at 01:37:48PM +0200, David Henningsson wrote:
> On 2010-10-04 12:15, David Henningsson wrote:
> >Position_fix quirks for specific machines now override the default
> >position_fix behavior for all HDA controllers.
> >
> >BugLink: http://launchpad.net/bugs/465942
> >BugLink: http://launchpad.net/bugs/580749
> >BugLink: http://launchpad.net/bugs/587546
> >
> >Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> 
> ...and here's the version for 2.6.35 and 2.6.32 stable trees.

Ok, but what's the corrisponding fix in Linus's tree?  What is the git
id of the patch there?

Please resend your version with that information in it.

thanks,

greg k-h

[RESEND] [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

This one never got picked up when I posted it a week ago.

On 2010-10-04 12:15, David Henningsson wrote:
> Position_fix quirks for specific machines now override the default
> position_fix behavior for all HDA controllers.
>
> BugLink: http://launchpad.net/bugs/465942
> BugLink: http://launchpad.net/bugs/580749
> BugLink: http://launchpad.net/bugs/587546
>
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>
>
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel


-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0001-ALSA-HDA-Correctly-apply-position_fix-quirks-for-ATI.patch --]
[-- Type: text/x-patch, Size: 1689 bytes --]

>From b36e71f568c26ab11909454c5bf8bc5d47dbf025 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Mon, 4 Oct 2010 12:02:14 +0200
Subject: [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

Position_fix quirks for specific machines now override the default
position_fix behavior for all HDA controllers.

BugLink: http://launchpad.net/bugs/465942
BugLink: http://launchpad.net/bugs/580749
BugLink: http://launchpad.net/bugs/587546

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/hda_intel.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 38b063e..5cbea85 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2315,14 +2315,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 		return fix;
 	}
 
-	/* Check VIA/ATI HD Audio Controller exist */
-	switch (chip->driver_type) {
-	case AZX_DRIVER_VIA:
-	case AZX_DRIVER_ATI:
-		/* Use link position directly, avoid any transfer problem. */
-		return POS_FIX_VIACOMBO;
-	}
-
 	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
 	if (q) {
 		printk(KERN_INFO
@@ -2331,6 +2323,15 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 		       q->value, q->subvendor, q->subdevice);
 		return q->value;
 	}
+
+	/* Check VIA/ATI HD Audio Controller exist */
+	switch (chip->driver_type) {
+	case AZX_DRIVER_VIA:
+	case AZX_DRIVER_ATI:
+		/* Use link position directly, avoid any transfer problem. */
+		return POS_FIX_VIACOMBO;
+	}
+
 	return POS_FIX_AUTO;
 }
 
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [RESEND] [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers

[Takashi Iwai]

At Tue, 12 Oct 2010 12:36:45 +0200,
David Henningsson wrote:
> 
> This one never got picked up when I posted it a week ago.

Oh yeah, thanks for noticing.
Applied now.


Takashi

> On 2010-10-04 12:15, David Henningsson wrote:
> > Position_fix quirks for specific machines now override the default
> > position_fix behavior for all HDA controllers.
> >
> > BugLink: http://launchpad.net/bugs/465942
> > BugLink: http://launchpad.net/bugs/580749
> > BugLink: http://launchpad.net/bugs/587546
> >
> > Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> >
> >
> >
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 
> 
> -- 
> David Henningsson, Canonical Ltd.
> http://launchpad.net/~diwic
> [2 0001-ALSA-HDA-Correctly-apply-position_fix-quirks-for-ATI.patch <text/x-patch (7bit)>]
> >From b36e71f568c26ab11909454c5bf8bc5d47dbf025 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Mon, 4 Oct 2010 12:02:14 +0200
> Subject: [PATCH] ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers
> 
> Position_fix quirks for specific machines now override the default
> position_fix behavior for all HDA controllers.
> 
> BugLink: http://launchpad.net/bugs/465942
> BugLink: http://launchpad.net/bugs/580749
> BugLink: http://launchpad.net/bugs/587546
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/hda_intel.c |   17 +++++++++--------
>  1 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 38b063e..5cbea85 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2315,14 +2315,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
>  		return fix;
>  	}
>  
> -	/* Check VIA/ATI HD Audio Controller exist */
> -	switch (chip->driver_type) {
> -	case AZX_DRIVER_VIA:
> -	case AZX_DRIVER_ATI:
> -		/* Use link position directly, avoid any transfer problem. */
> -		return POS_FIX_VIACOMBO;
> -	}
> -
>  	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
>  	if (q) {
>  		printk(KERN_INFO
> @@ -2331,6 +2323,15 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
>  		       q->value, q->subvendor, q->subdevice);
>  		return q->value;
>  	}
> +
> +	/* Check VIA/ATI HD Audio Controller exist */
> +	switch (chip->driver_type) {
> +	case AZX_DRIVER_VIA:
> +	case AZX_DRIVER_ATI:
> +		/* Use link position directly, avoid any transfer problem. */
> +		return POS_FIX_VIACOMBO;
> +	}
> +
>  	return POS_FIX_AUTO;
>  }
>  
> -- 
> 1.7.1
>