ALSA: oxygen stable commit difference
Subsystems (3)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
This:
commit 1f91ecc14deea9461aca93273d78871ec4d98fcd
Author: Roman Volkov <[email protected]> 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 <[email protected]> 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-----
From 44c5d3f4fa20751a53279cb93be4e9a2974fc01a Mon Sep 17 00:00:00 2001
From: Roman Volkov <[email protected]>
Date: Fri, 24 Jan 2014 16:18:11 +0400
Subject: [PATCH 1/1] ALSA: oxygen: modify adjust_dg_dac_routing function
commit 1f91ecc14deea9461aca93273d78871ec4d98fcd upstream.
When selecting the audio output destinations (headphones, FP headphones, multichannel output), the channel routing should be changed depending on what destination selected. Also unnecessary I2S channels are digitally muted. This function called when the user selects the destination in the ALSA mixer.
--- sound/pci/oxygen/xonar_dg.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/pci/oxygen/xonar_dg.c +10 -0
@@ -294,6 +294,16 @@ static int output_switch_put(struct snd_kcontrol *ctl,oxygen_write16_masked (chip,OXYGEN_GPIO_DATA , data->output_sel ==1 ?GPIO_HP_REAR :0 ,GPIO_HP_REAR ); +oxygen_write8_masked (chip,OXYGEN_PLAY_ROUTING , + data->output_sel ==0 ? +OXYGEN_PLAY_MUTE01 : +OXYGEN_PLAY_MUTE23 | +OXYGEN_PLAY_MUTE45 | +OXYGEN_PLAY_MUTE67 , +OXYGEN_PLAY_MUTE01 | +OXYGEN_PLAY_MUTE23 | +OXYGEN_PLAY_MUTE45 | +OXYGEN_PLAY_MUTE67 ); }mutex_unlock (&chip->mutex);return changed;
Signature · 1 line
2.3.7
From 1f91ecc14deea9461aca93273d78871ec4d98fcd Mon Sep 17 00:00:00 2001
From: Roman Volkov <[email protected]>
Date: Fri, 24 Jan 2014 16:18:11 +0400
Subject: [PATCH 1/1] ALSA: oxygen: modify adjust_dg_dac_routing function
When selecting the audio output destinations (headphones, FP headphones, multichannel output), the channel routing should be changed depending on what destination selected. Also unnecessary I2S channels are digitally muted. This function called when the user selects the destination in the ALSA mixer.
--- sound/pci/oxygen/xonar_dg.c | 44 ++++++++++++++++++++------------------------ sound/pci/oxygen/xonar_dg.h | 2 ++ 2 files changed, 22 insertions(+), 24 deletions(-)
sound/pci/oxygen/xonar_dg.c +20 -24
53 lines not on this page · raw message
sound/pci/oxygen/xonar_dg.h +2 -0
@@ -26,6 +26,8 @@ enum cs4245_shadow_operation {struct dg {/* shadow copy of the CS4245 register space */ unsigned char cs4245_shadow[17 ]; +/* output select: headphone/speakers */ +unsigned char pcm_output;unsigned int output_sel;s8 input_vol[4 ][2 ];unsigned int input_sel;
Signature · 1 line
2.3.7
Clemens Ladisch
maintainerQuoted 5 lines · Jiri Slaby
This:
commit1f91ecc14deea9461aca93273d78871ec4d98fcdAuthor: Roman Volkov <[email protected]> Date: Fri Jan 24 16:18:11 2014 +0400
Quoted 7 lines
ALSA: oxygen: modify
adjust_dg_dac_routingfunctionwas 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.
Quoted 7 lines
2) do we need the one below, which is marked as "Fixes" the above?
commit
305564413c99514a14a49215790d96b8d71a6295Author: Clemens Ladisch <[email protected]> Date: Tue Mar 18 09:31:18 2014 +0100ALSA: 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
В Fri, 15 May 2015 22:40:54 +0200
Clemens Ladisch <[email protected]> пишет:
Quoted 27 lines
Quoted 5 lines · Jiri Slaby
This:
commit1f91ecc14deea9461aca93273d78871ec4d98fcdAuthor: Roman Volkov <[email protected]> Date: Fri Jan 24 16:18:11 2014 +0400Quoted 7 lines
ALSA: oxygen: modify
adjust_dg_dac_routingfunctionwas 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.
Quoted 6 lines
2) do we need the one below, which is marked as "Fixes" the above?
commit
305564413c99514a14a49215790d96b8d71a6295Author: Clemens Ladisch <[email protected]> Date: Tue Mar 18 09:31:18 2014 +0100
Quoted 8 lines
Quoted 1 line
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
Quoted 12 lines · Roman Volkov
Quoted 12 lines
Quoted 12 lines
Quoted 7 lines
Quoted 7 lines
2) do we need the one below, which is marked as "Fixes" the above?
commit
305564413c99514a14a49215790d96b8d71a6295Author: Clemens Ladisch <[email protected]> Date: Tue Mar 18 09:31:18 2014 +0100ALSA: 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.
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Regards,
ClemensAgree with Clemens, the patches are not totally different. The key change is the
OXYGEN_PLAY_ROUTINGregister modification. The functionadjust_dg_dac_routing()in the upstream driver is called fromoutput_select_put()which is the same asoutput_switch_put()from the -stable driver.
Ok, thanks for the info.
Signature · 2 lines
js suse labs