From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D28C43461 for ; Mon, 7 Sep 2020 16:48:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5880D2080A for ; Mon, 7 Sep 2020 16:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599497334; bh=5oXEwq1rdJ5qKxfA72B/oCDaNpskMTnd2ImgwuBx43I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BN6NG3ghoc6N82WRAmFWVMcEYhb7skH97UhQtjRONBCqz7bAgYmpViwMD7V73BJjd WY39TU/aJgLx9Whp0vXCW3rSFUL0wetN8KQfUp5K7H4kFOi5limUNdvPv96FoRgK4i R1mvCZ2ZZTUkF+nFTOeXMg92lspHL+uZQzDJLhrE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730692AbgIGQsv (ORCPT ); Mon, 7 Sep 2020 12:48:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:48646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730816AbgIGQfJ (ORCPT ); Mon, 7 Sep 2020 12:35:09 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 45C49221EB; Mon, 7 Sep 2020 16:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599496509; bh=5oXEwq1rdJ5qKxfA72B/oCDaNpskMTnd2ImgwuBx43I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=krtp2lkdwy2wTidDjbWntvoFLdxEtS95ue2S6jxzuQ7CSKVveRTxiwDpAHcisscuB KGvaN78wm1xYje/JxR+vcE+tEJ8NbMsMDViqwmqd6Q1W1rNs9ClRZidieIgR7459eS a/AUYBB1GJYL8oFp7C/B7yMhp/YmrORU406fgHPE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mohan Kumar , Sameer Pujar , Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.14 06/17] ALSA: hda: Fix 2 channel swapping for Tegra Date: Mon, 7 Sep 2020 12:34:49 -0400 Message-Id: <20200907163500.1281543-6-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200907163500.1281543-1-sashal@kernel.org> References: <20200907163500.1281543-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mohan Kumar [ Upstream commit 216116eae43963c662eb84729507bad95214ca6b ] The Tegra HDA codec HW implementation has an issue related to not swapping the 2 channel Audio Sample Packet(ASP) channel mapping. Whatever the FL and FR mapping specified the left channel always comes out of left speaker and right channel on right speaker. So add condition to disallow the swapping of FL,FR during the playback. Signed-off-by: Mohan Kumar Acked-by: Sameer Pujar Link: https://lore.kernel.org/r/20200825052415.20626-2-mkumard@nvidia.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/patch_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 9e8cfc409b4b3..d0400538bd2db 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -3398,6 +3398,7 @@ static int tegra_hdmi_build_pcms(struct hda_codec *codec) static int patch_tegra_hdmi(struct hda_codec *codec) { + struct hdmi_spec *spec; int err; err = patch_generic_hdmi(codec); @@ -3405,6 +3406,10 @@ static int patch_tegra_hdmi(struct hda_codec *codec) return err; codec->patch_ops.build_pcms = tegra_hdmi_build_pcms; + spec = codec->spec; + spec->chmap.ops.chmap_cea_alloc_validate_get_type = + nvhdmi_chmap_cea_alloc_validate_get_type; + spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate; return 0; } -- 2.25.1