From patchwork Thu Jan 3 14:23:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1020343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ACrLPngJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Vqs63rxQz9s4s for ; Fri, 4 Jan 2019 01:23:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731919AbfACOXV (ORCPT ); Thu, 3 Jan 2019 09:23:21 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34243 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730973AbfACOXV (ORCPT ); Thu, 3 Jan 2019 09:23:21 -0500 Received: by mail-wr1-f67.google.com with SMTP id j2so33841483wrw.1 for ; Thu, 03 Jan 2019 06:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RVL2wFflv+zmfSz5gHNj0ozT4I2eh2hqgvb0nPbItDg=; b=ACrLPngJXoCRi3uZVqBGSc4xa7oyMkOwLSo6UZMPipin8J4en1nRaDP4TrfPkEZAix 4kU3pkS2eJhQHjCg3skA1YbmnOxdbFJkgMXOAKDHyZrvHUg2ienpmOjGG1fMj5f2NvXa 5/Iyg2qhAEHwqpDd0oQ1uLy1KCK802P/xw1IvJDLPEl2eJrMjFD+EW7zbTUXtPZf74Qr 0TlzNoqod/ngiYgzfY+ytukH3crcbzgWKV3z9YKqlJ9gCME8OGvPskahv8cCJalB9999 02j3vdBAMGp2/fcQTphy5fPi+NnQiYSidtQO8vqpVKIcNq0Tcm3H2b3DQeTzzw7Y33Q0 JDkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RVL2wFflv+zmfSz5gHNj0ozT4I2eh2hqgvb0nPbItDg=; b=BvFL7kvk6ak6XWrcwobAqvmrxOzv6fHo9WzTcg03C4D4d5NlqgQ0jLiAqLF1Ub6f5S RgLEXjRYEXP5VRzFx+q57wbJ3tnBRyP3FEyD0NHYRKtVzN3Rq+Zu00Suf3Szxc9F6HLq GCEg6zXlRQvVgTTO4Zk7CtkNaZh6J6XJfNEfw2M2pou0wn7mgDU+W+3jacsL5gPDPKip v+xA/je51yr1Y5h7ArmLR6lf/4C1yjoTSej+vPjw08nd2pP4r+Rpqgw5SRbMr+VjbtFM zWHj+MeGDuKboU+uENdakGpN8Cy0pt+pOlHCloxeJyObUcGxhqIPMIj2p2kCQ5KPnq+d Si0Q== X-Gm-Message-State: AJcUukfHnqSHMTahprfyIF+DlKTUz9xK7VPyN9glDBHo3oZIwVoCos5T iH/PfapXLkKV7pNre8mvPS4= X-Google-Smtp-Source: ALg8bN57I+gTwIQCFp7ToTPddrOwnypwNXg3qYgeiCvsJIQ8ao1KgqTj85yL0yt99KQDUaQdVvTtZA== X-Received: by 2002:a5d:6684:: with SMTP id l4mr3577561wru.154.1546525399002; Thu, 03 Jan 2019 06:23:19 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id v133sm41446375wmf.19.2019.01.03.06.23.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Jan 2019 06:23:18 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Mohan Kumar , Ujwal Patel , Sameer Pujar , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH 1/3] drm/tegra: sor: Parse more data from HDA format Date: Thu, 3 Jan 2019 15:23:15 +0100 Message-Id: <20190103142317.26124-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding The HDA format data passed to the SOR from the HDA codec contains more information than just the rate and number of channels. Parse all the fields and store them in an internal structure for subsequent use. While at it, also fix an off-by-one error in the number of channels. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/sor.c | 69 ++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index ef8692b7075a..7839223aa040 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -393,6 +393,13 @@ struct tegra_sor_ops { int (*remove)(struct tegra_sor *sor); }; +struct tegra_sor_audio { + unsigned int sample_rate; + unsigned int channels; + unsigned int bits; + bool pcm; +}; + struct tegra_sor { struct host1x_client client; struct tegra_output output; @@ -429,10 +436,7 @@ struct tegra_sor { struct delayed_work scdc; bool scdc_enabled; - struct { - unsigned int sample_rate; - unsigned int channels; - } audio; + struct tegra_sor_audio audio; }; struct tegra_sor_state { @@ -3195,22 +3199,58 @@ static int tegra_sor_parse_dt(struct tegra_sor *sor) return 0; } -static void tegra_hda_parse_format(unsigned int format, unsigned int *rate, - unsigned int *channels) +static void tegra_hda_parse_format(unsigned int format, + struct tegra_sor_audio *audio) { - unsigned int mul, div; + unsigned int mul, div, bits, channels; + + if (format & AC_FMT_TYPE_NON_PCM) + audio->pcm = false; + else + audio->pcm = true; if (format & AC_FMT_BASE_44K) - *rate = 44100; + audio->sample_rate = 44100; else - *rate = 48000; + audio->sample_rate = 48000; mul = (format & AC_FMT_MULT_MASK) >> AC_FMT_MULT_SHIFT; div = (format & AC_FMT_DIV_MASK) >> AC_FMT_DIV_SHIFT; - *rate = *rate * (mul + 1) / (div + 1); + audio->sample_rate = audio->sample_rate * (mul + 1) / (div + 1); + + switch (format & AC_FMT_BITS_MASK) { + case AC_FMT_BITS_8: + audio->bits = 8; + break; + + case AC_FMT_BITS_16: + audio->bits = 16; + break; + + case AC_FMT_BITS_20: + audio->bits = 20; + break; + + case AC_FMT_BITS_24: + audio->bits = 24; + break; + + case AC_FMT_BITS_32: + audio->bits = 32; + break; + + default: + bits = (format & AC_FMT_BITS_MASK) >> AC_FMT_BITS_SHIFT; + WARN(1, "invalid number of bits: %#x\n", bits); + audio->bits = 8; + break; + } - *channels = (format & AC_FMT_CHAN_MASK) >> AC_FMT_CHAN_SHIFT; + channels = (format & AC_FMT_CHAN_MASK) >> AC_FMT_CHAN_SHIFT; + + /* channels are encoded as n - 1 */ + audio->channels = channels + 1; } static irqreturn_t tegra_sor_irq(int irq, void *data) @@ -3225,14 +3265,11 @@ static irqreturn_t tegra_sor_irq(int irq, void *data) value = tegra_sor_readl(sor, SOR_AUDIO_HDA_CODEC_SCRATCH0); if (value & SOR_AUDIO_HDA_CODEC_SCRATCH0_VALID) { - unsigned int format, sample_rate, channels; + unsigned int format; format = value & SOR_AUDIO_HDA_CODEC_SCRATCH0_FMT_MASK; - tegra_hda_parse_format(format, &sample_rate, &channels); - - sor->audio.sample_rate = sample_rate; - sor->audio.channels = channels; + tegra_hda_parse_format(format, &sor->audio); tegra_sor_hdmi_audio_enable(sor); } else {