[3.11,229/233] ALSA: hda - hdmi: introduce patch_nvhdmi()

3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Anssi Hannula <anssi.hannula@iki.fi>

(This is a backport of *part* of upstream 611885bc963a "ALSA: hda -
hdmi: Disallow unsupported 2ch remapping on NVIDIA codecs" to stable
3.10 through 3.12. Later stable already contain all of the original
patch.)

Mainline commit 611885bc963a "ALSA: hda - hdmi: Disallow unsupported 2ch
remapping on NVIDIA codecs" introduces function patch_nvhdmi(). That
function is edited by 75fae117a5db "ALSA: hda/hdmi - allow PIN_OUT to be
dynamically enabled". In order to backport the PIN_OUT patch, I am first
back-porting just the addition of function patch_nvhdmi(), so that the
conflicts applying the PIN_OUT patch are simplified.

Ideally, one might backport all of 611885bc963a. However, that commit
doesn't apply to stable kernels, since it relies on a chain of other
patches which implement new features.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[swarren, extracted just a small part of the original patch]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 sound/pci/hda/patch_hdmi.c | 60 ++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 23 deletions(-)

Hi,

On 02/07/2014 12:47 PM, Luis Henriques wrote:
> 3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.
>  [...]
>  
> +static int patch_nvhdmi(struct hda_codec *codec)
> +{
> +	struct hdmi_spec *spec;
> +	int err;
> +
> +	err = patch_generic_hdmi(codec);
> +	if (err)
> +		return err;
> +
> +	spec = codec->spec;
> +
> +	return 0;
> +}
> [...]

Is it just me or is it that the 'spec' variable has no use?

On Fri, Feb 07, 2014 at 12:58:47PM +0100, Levente Kurusa wrote:
> Hi,
> 
> On 02/07/2014 12:47 PM, Luis Henriques wrote:
> > 3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.
> >  [...]
> >  
> > +static int patch_nvhdmi(struct hda_codec *codec)
> > +{
> > +	struct hdmi_spec *spec;
> > +	int err;
> > +
> > +	err = patch_generic_hdmi(codec);
> > +	if (err)
> > +		return err;
> > +
> > +	spec = codec->spec;
> > +
> > +	return 0;
> > +}
> > [...]
> 
> Is it just me or is it that the 'spec' variable has no use?

This does seem a little bit odd indeed.  I've picked the backport provided
by Stephen, which has been queued for the 3.10 and 3.12 stable kernels as
well.  The original patch actually modifies the ops field in the hdmi_spec
struct, however this field doesn't exist in this kernel version.

Stephen, could you please comment?  Since this is just a partial backport
of 611885bc963a ("ALSA: hda - hdmi: Disallow unsupported 2ch remapping on
NVIDIA codecs"), I'm assuming this is correct -- although the spec
variable could have been dropped.

Cheers,
--
Luis

On 02/07/2014 07:36 AM, Luis Henriques wrote:
> On Fri, Feb 07, 2014 at 12:58:47PM +0100, Levente Kurusa wrote:
>> Hi,
>>
>> On 02/07/2014 12:47 PM, Luis Henriques wrote:
>>> 3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.
>>>  [...]
>>>  
>>> +static int patch_nvhdmi(struct hda_codec *codec)
>>> +{
>>> +	struct hdmi_spec *spec;
>>> +	int err;
>>> +
>>> +	err = patch_generic_hdmi(codec);
>>> +	if (err)
>>> +		return err;
>>> +
>>> +	spec = codec->spec;
>>> +
>>> +	return 0;
>>> +}
>>> [...]
>>
>> Is it just me or is it that the 'spec' variable has no use?
> 
> This does seem a little bit odd indeed.  I've picked the backport provided
> by Stephen, which has been queued for the 3.10 and 3.12 stable kernels as
> well.  The original patch actually modifies the ops field in the hdmi_spec
> struct, however this field doesn't exist in this kernel version.
> 
> Stephen, could you please comment?  Since this is just a partial backport
> of 611885bc963a ("ALSA: hda - hdmi: Disallow unsupported 2ch remapping on
> NVIDIA codecs"), I'm assuming this is correct -- although the spec
> variable could have been dropped.

The very next patch of mine to this file (in other stable releases)
makes use of the spec variable. I kept the addition of the spec variable
in this patch, even though it isn't used until the next patch, so that
it stayed as part of the backport of this patch which originally added
it, rather than moving it to the other patch I backported, and hence
mixing up multiple upstream patches in the same backported patch.

On Fri, Feb 07, 2014 at 09:20:57AM -0700, Stephen Warren wrote:
> On 02/07/2014 07:36 AM, Luis Henriques wrote:
> > On Fri, Feb 07, 2014 at 12:58:47PM +0100, Levente Kurusa wrote:
> >> Hi,
> >>
> >> On 02/07/2014 12:47 PM, Luis Henriques wrote:
> >>> 3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.
> >>>  [...]
> >>>  
> >>> +static int patch_nvhdmi(struct hda_codec *codec)
> >>> +{
> >>> +	struct hdmi_spec *spec;
> >>> +	int err;
> >>> +
> >>> +	err = patch_generic_hdmi(codec);
> >>> +	if (err)
> >>> +		return err;
> >>> +
> >>> +	spec = codec->spec;
> >>> +
> >>> +	return 0;
> >>> +}
> >>> [...]
> >>
> >> Is it just me or is it that the 'spec' variable has no use?
> > 
> > This does seem a little bit odd indeed.  I've picked the backport provided
> > by Stephen, which has been queued for the 3.10 and 3.12 stable kernels as
> > well.  The original patch actually modifies the ops field in the hdmi_spec
> > struct, however this field doesn't exist in this kernel version.
> > 
> > Stephen, could you please comment?  Since this is just a partial backport
> > of 611885bc963a ("ALSA: hda - hdmi: Disallow unsupported 2ch remapping on
> > NVIDIA codecs"), I'm assuming this is correct -- although the spec
> > variable could have been dropped.
> 
> The very next patch of mine to this file (in other stable releases)
> makes use of the spec variable. I kept the addition of the spec variable
> in this patch, even though it isn't used until the next patch, so that
> it stayed as part of the backport of this patch which originally added
> it, rather than moving it to the other patch I backported, and hence
> mixing up multiple upstream patches in the same backported patch.

Doh!  I've applied both of your two patches to the 3.11 kernel.  And while
I first reviewed them, I've seen that detail and it made perfect sense ;)

Anyway, thank you for your clarification.

Cheers,
--
Luis