From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from v1ros.org ([109.234.34.72]:38630 "EHLO smtp.v1ros.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S2992518AbbEOW20 convert rfc822-to-8bit (ORCPT
	<rfc822;stable@vger.kernel.org>); Fri, 15 May 2015 18:28:26 -0400
Date: Sat, 16 May 2015 01:18:07 +0300
From: Roman Volkov <rvolkov@v1ros.org>
To: Jiri Slaby <jslaby@suse.cz>
Cc: Clemens Ladisch <clemens@ladisch.de>,
	Greg KH <gregkh@linuxfoundation.org>,
	stable <stable@vger.kernel.org>, Takashi Iwai <tiwai@suse.de>
Subject: Re: ALSA: oxygen stable commit difference
Message-ID: <20150516011807.6d463354@v1ron-s7>
In-Reply-To: <555659D6.8090601@ladisch.de>
References: <55560015.9080604@suse.cz>
	<555659D6.8090601@ladisch.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

В 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