ALSA: oxygen stable commit difference

ALSA: oxygen stable commit difference

[Jiri Slaby]

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

This:
commit 1f91ecc14deea9461aca93273d78871ec4d98fcd
Author: Roman Volkov <v1ron@mail.ru>
Date:   Fri Jan 24 16:18:11 2014 +0400

    ALSA: oxygen: modify adjust_dg_dac_routing function

was merged in 3.14 and was also put to several stable trees back in
early 2014. But the commit in stable trees is totally different to
what is in upstream. I am attaching version from upstream and from
3.12 for example.

I have two questions:
1) why is it a totally different diff?
2) do we need the one below, which is marked as "Fixes" the above?

commit 305564413c99514a14a49215790d96b8d71a6295
Author: Clemens Ladisch <clemens@ladisch.de>
Date:   Tue Mar 18 09:31:18 2014 +0100

    ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression


thanks,
- -- 
js
suse labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJVVgARAAoJEL0lsQQGtHBJjXAQAIACYbsS7GHJs0JxatW+ua6w
MuiNmQqRQk6A5xvQ50mBnrBS7keD2vy7LhLA6yH/czCxwrJbxtEg+HNIEJ9hQ2T3
kMLlkxRXkMn4G3ajQL4x+Ne9FCvzOieYgpn/Jb27vLISyRNJpF9mv069CUk6qA2b
IEaaQjuu9thF9yXw4zFUGzYC1vK2UqHdpl2Bi/rAmEfucLQHFgLFG6LGWfCnxv77
nBxEhds7OARnNhgJ5AW9gvv+fGQ8YoHCAFgxRIDrxzELV75BvlS4YZR/n72qb3s0
pX3EDiId62zkhvtu3H1zTbjRLunqf2rZISzcorcOvZniCsYnFkA2NQFHWCXbxG1Q
7LrRNeLktxYZ0NUjTqpchxJ26Tm1x6iIjHmgRmIdJoh/oL0Vgt4Tfna+jQvsJyOd
fu9YVhLHp9uc+hgR+w3wL1VoiafeK9QlgxQ+m0ztKnp8hpN+TQBoaAEBkmlMG8uu
5/pI7STn2yHmzGZMWqlq6UgDSrFI/AeMD8RnEW24idtY4Aqb3gEIXnZq37LHQ4te
mBJZJl4zr+HDJeznR2wSLs+ZtOUIVtfE1exF4Qqwg66r+aobbZ3wk+mI9njjt0L9
JwXneMXmK0nx6q8Jc6NFM0pRkOW/dE1HGFdw/naeKTACefl+LfR2ldr44+S7y7IZ
isu5x2hPiMwKcFCf6/4e
=S0ql
-----END PGP SIGNATURE-----

[-- Attachment #2: 312.patch --]
[-- Type: application/mbox, Size: 1581 bytes --]

[-- Attachment #3: upstream.patch --]
[-- Type: application/mbox, Size: 3193 bytes --]

Re: ALSA: oxygen stable commit difference

[Clemens Ladisch]

Jiri Slaby wrote:
> This:
> commit 1f91ecc14deea9461aca93273d78871ec4d98fcd
> Author: Roman Volkov <v1ron@mail.ru>
> Date:   Fri Jan 24 16:18:11 2014 +0400
>
>     ALSA: oxygen: modify adjust_dg_dac_routing function
>
> was merged in 3.14 and was also put to several stable trees back in
> early 2014. But the commit in stable trees is totally different to
> what is in upstream.
>
> 1) why is it a totally different diff?

The upstream commit was part of a larger reorganization and depended on
lots of earlier changes.  The OXYGEN_PLAY_MUTE* changes are the correct
backport for the old driver; the OXYGEN_PLAY_DACx_SOURCE* changes would
have been meaningless in the old driver.

It was an error to not mention this in the stable commit message.

> 2) do we need the one below, which is marked as "Fixes" the above?
>
> commit 305564413c99514a14a49215790d96b8d71a6295
> Author: Clemens Ladisch <clemens@ladisch.de>
> Date:   Tue Mar 18 09:31:18 2014 +0100
>
>     ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression

This reverts exactly those parts that were not backported to -stable,
so it must not (and cannot) be applied to -stable.


Regards,
Clemens

Re: ALSA: oxygen stable commit difference

[Roman Volkov]

В Fri, 15 May 2015 22:40:54 +0200
Clemens Ladisch <clemens@ladisch.de> пишет:

> Jiri Slaby wrote:
> > This:
> > commit 1f91ecc14deea9461aca93273d78871ec4d98fcd
> > Author: Roman Volkov <v1ron@mail.ru>
> > Date:   Fri Jan 24 16:18:11 2014 +0400
> >
> >     ALSA: oxygen: modify adjust_dg_dac_routing function
> >
> > was merged in 3.14 and was also put to several stable trees back in
> > early 2014. But the commit in stable trees is totally different to
> > what is in upstream.
> >
> > 1) why is it a totally different diff?
> 
> The upstream commit was part of a larger reorganization and depended
> on lots of earlier changes.  The OXYGEN_PLAY_MUTE* changes are the
> correct backport for the old driver; the OXYGEN_PLAY_DACx_SOURCE*
> changes would have been meaningless in the old driver.
> 
> It was an error to not mention this in the stable commit message.
> 
> > 2) do we need the one below, which is marked as "Fixes" the above?
> >
> > commit 305564413c99514a14a49215790d96b8d71a6295
> > Author: Clemens Ladisch <clemens@ladisch.de>
> > Date:   Tue Mar 18 09:31:18 2014 +0100
> >
> >     ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression
> 
> This reverts exactly those parts that were not backported to -stable,
> so it must not (and cannot) be applied to -stable.
> 
> 
> Regards,
> Clemens

Agree with Clemens, the patches are not totally different. The key
change is the OXYGEN_PLAY_ROUTING register modification. The function
adjust_dg_dac_routing() in the upstream driver is called from
output_select_put() which is the same as output_switch_put() from the
-stable driver.

Regards,
Roman

Re: ALSA: oxygen stable commit difference

[Jiri Slaby]

On 05/16/2015, 12:18 AM, Roman Volkov wrote:
>>> > > 2) do we need the one below, which is marked as "Fixes" the above?
>>> > >
>>> > > commit 305564413c99514a14a49215790d96b8d71a6295
>>> > > Author: Clemens Ladisch <clemens@ladisch.de>
>>> > > Date:   Tue Mar 18 09:31:18 2014 +0100
>>> > >
>>> > >     ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression
>> > 
>> > This reverts exactly those parts that were not backported to -stable,
>> > so it must not (and cannot) be applied to -stable.
>> > 
>> > 
>> > Regards,
>> > Clemens
> Agree with Clemens, the patches are not totally different. The key
> change is the OXYGEN_PLAY_ROUTING register modification. The function
> adjust_dg_dac_routing() in the upstream driver is called from
> output_select_put() which is the same as output_switch_put() from the
> -stable driver.

Ok, thanks for the info.


-- 
js
suse labs