From patchwork Mon Aug 12 12:07:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171060 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2746951ily; Mon, 12 Aug 2019 05:07:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKYBC5xqDJrpvYR2AZnjf+Gg0DonMsZa3WoatJbV3Eh/k0qMPID6TcrJKkxYmGUbOID101 X-Received: by 2002:a17:902:1e6:: with SMTP id b93mr32160755plb.295.1565611656361; Mon, 12 Aug 2019 05:07:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611656; cv=none; d=google.com; s=arc-20160816; b=l3wkqCDyJEIuLXZQ2zCOKjZk/GkotvnVZHZ9EQSIfPcZQK2KSWzBalWxO5yPvKzsW2 sXb91Nlwb61uFJkQMOzXQ9rmJqTpab3He3UH3alTZKoWcOBZ6WAU09tqHqm7DTPnaFZv 0SqDgKHXM1XfA57q8ZHk9OL6ibqU6aY3j7iNLBntuOmuEQUrXRijCEHCE9cGuMa2j2zA 36KN+Qzq+celQeIvFVLC3EDj8BoIwo2hXppQ6lHOgbVPIQcMOfOFqUroNJPwT+DY4Bco RfekWfV8/y25NiDL5c6H/+jxoXtUgk8FaNBqyCPOmOubao7+VaeK85XiBNojEc5pCGgP goZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ceoz58HJhiw+4Z6q1/xd/gAe7VVmzCvD6fU8sO+lm5o=; b=J92lG2dgKlpJnr6o7+Rt+IzEowCcft/CJ6MseT6rLODKAPLQ9Ik7DfToaxn6iwGhNs jXP2pocvS/jHvkb66DoMWXZ+eUYOpxxIJOdvsHjKa3kYO/LXhkxsuauLoMyNeV9k7jFj k0FvNQHVAUE2L/OFO0JPJQTg7QrL8q7LQeVa59W1Ux+G6fFd5Q9mckV61RjbfKrbbx9d W5i1YeWTJNoX7CUWk6aaLCUY2AdHv0WA8ZZNvKOT6+f8iVhPI9vgGn1VcD2IIa9DMeaZ inbzESEXLiSm72IK8jQoz4sfMpvokzxJ/qo0azMVmjUPYYAHPIv+SzATKMK93i3b6AQp TEmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Or3uQR6Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t34si23074029plb.29.2019.08.12.05.07.36; Mon, 12 Aug 2019 05:07:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Or3uQR6Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728433AbfHLMHf (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:35 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41347 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727975AbfHLMHd (ORCPT ); Mon, 12 Aug 2019 08:07:33 -0400 Received: by mail-wr1-f65.google.com with SMTP id j16so2073622wrr.8 for ; Mon, 12 Aug 2019 05:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ceoz58HJhiw+4Z6q1/xd/gAe7VVmzCvD6fU8sO+lm5o=; b=Or3uQR6QO71RP1JieY4+QIypkqR1ZLSwxIsThtNzg2pwMJw3ABCgPudYblpSyj9V9U Ur910YS8Rv83kYjvTFn8d8JSeGMX0uL0dP2qioI7DJ2HB81GTaYS0I7ia+Pm4V0WNunt 9Cep9ntP0tfqwN+EqG8JABr2Up4KQM/Fb2AsNgOkuPhktdjG+hCt6PJSr98UMiBlKvy5 3ibft6dtlkFlG2OgeL12AMKbPtVlpitDZfN0XFZIOZlkjRLFplktrwwat9WpWDFv4tqp s0pWWckNeTbPaB2h0XABYkbZFQhwX2jPQI5Hcv34lLxlKWju91BJM3kA19oGZXZImzxQ Nd1A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ceoz58HJhiw+4Z6q1/xd/gAe7VVmzCvD6fU8sO+lm5o=; b=juVtlE4FLqLA6JNz+JBG3x09YZ3Vu8H4MRhWcdFtKXOwqtDaeonQNz9KlFsr08+BYn E6cBcRuOGoxbWZRZM8JxKdtMfuD+LnNTyBO6B9WboSg/OpQAsvIOtYuiTfSK00W980Ef LTSQtdg0FnriF9HKkEuubXlRHG9lCPAANDtEh+R3BF92olHdj2IdXU8gIATMp5qLbdo8 MiEL4I0Kw92BjIZxzV8JiqUTmpHzp2p92/oDNQgtzGP83kgXNlEjn65PqqZsHBMfhTQ4 FQ5llmOkrO8uecES6ciBj862l0DIsK0NNA9vDZ/7u2P7DJRM/wdQfDim6BRWaPHKSsy0 hYzw== X-Gm-Message-State: APjAAAWJJmpYby1YWYZX0TnaCSSPJj0gcZPT2kTPyCLMTLfQH+al7r/t Oob5aourx2u33HztYx0VIP1eQ/qS1kc= X-Received: by 2002:adf:f705:: with SMTP id r5mr16743424wrp.342.1565611650885; Mon, 12 Aug 2019 05:07:30 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:30 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/8] drm/bridge: dw-hdmi-i2s: support more i2s format Date: Mon, 12 Aug 2019 14:07:19 +0200 Message-Id: <20190812120726.1528-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The dw-hdmi-i2s supports more formats than just regular i2s. Add support for left justified, right justified and dsp modes A and B. Reviewed-by: Jonas Karlman Signed-off-by: Jerome Brunet --- .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 26 ++++++++++++++++--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 6 +++-- 2 files changed, 27 insertions(+), 5 deletions(-) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index 5cbb71a866d5..2b624cff541d 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -44,9 +44,8 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, u8 inputclkfs = 0; /* it cares I2S only */ - if ((fmt->fmt != HDMI_I2S) || - (fmt->bit_clk_master | fmt->frame_clk_master)) { - dev_err(dev, "unsupported format/settings\n"); + if (fmt->bit_clk_master | fmt->frame_clk_master) { + dev_err(dev, "unsupported clock settings\n"); return -EINVAL; } @@ -63,6 +62,27 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, break; } + switch (fmt->fmt) { + case HDMI_I2S: + conf1 |= HDMI_AUD_CONF1_MODE_I2S; + break; + case HDMI_RIGHT_J: + conf1 |= HDMI_AUD_CONF1_MODE_RIGHT_J; + break; + case HDMI_LEFT_J: + conf1 |= HDMI_AUD_CONF1_MODE_LEFT_J; + break; + case HDMI_DSP_A: + conf1 |= HDMI_AUD_CONF1_MODE_BURST_1; + break; + case HDMI_DSP_B: + conf1 |= HDMI_AUD_CONF1_MODE_BURST_2; + break; + default: + dev_err(dev, "unsupported format\n"); + return -EINVAL; + } + dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h index 4e3ec09d3ca4..091d7c28aa17 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -869,8 +869,10 @@ enum { /* AUD_CONF1 field values */ HDMI_AUD_CONF1_MODE_I2S = 0x00, - HDMI_AUD_CONF1_MODE_RIGHT_J = 0x02, - HDMI_AUD_CONF1_MODE_LEFT_J = 0x04, + HDMI_AUD_CONF1_MODE_RIGHT_J = 0x20, + HDMI_AUD_CONF1_MODE_LEFT_J = 0x40, + HDMI_AUD_CONF1_MODE_BURST_1 = 0x60, + HDMI_AUD_CONF1_MODE_BURST_2 = 0x80, HDMI_AUD_CONF1_WIDTH_16 = 0x10, HDMI_AUD_CONF1_WIDTH_24 = 0x18, From patchwork Mon Aug 12 12:07:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171064 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747194ily; Mon, 12 Aug 2019 05:07:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLBTX5S9vGkpiwCmk/7O9WQMeZ52KKCPaainQUrESnGvPvSA42G0ygOS3DB0DYx1T6yucZ X-Received: by 2002:aa7:90d4:: with SMTP id k20mr34215943pfk.78.1565611667358; Mon, 12 Aug 2019 05:07:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611667; cv=none; d=google.com; s=arc-20160816; b=FBF1PaKhZwfDTAVPsSQidLZjJ2dhD00vzxZJY5zlchrKcfLDZSboMY3qiSsqYfYXdf HVAnr0MAqQjDV4zfgvMyoWQw3wm6ZL8oJ3D5F6tapS5gzAEPwwYx2JDhlrrhh5FiFzfl LetvBJSRuIzvdHBiFGBfI5dhaMBkAp4Tlg1bvP8bMpODq2HxTgswy0+Z+vYXMzOmk9Rp lGBg5GfLeO3/ozHvPrgAVJ6MmGWsxbLZ3jdItZAcuDs0i24ohJNoOKBEZ/IQj1hwhx1S p6hI2KBiNbd9oPuhoMSDyM1DtH4Vo/ohz2ALY2hMLwfqTKO0naYVHlJ0AgRLccMHEL8/ y2Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f27o2oE+oJHz4miX1Hf8EQ6LoL/TmaOJvKtMiSXbELE=; b=aHhaQ6SQubGhoueQWqsXLTF6XFvB3vFiuW//wlAjvCDDFJ+0j19+x7ll0KK7y/0yWc Np59zOo9QFNLCugYFGB2ER8c+frvbGDzJA9CjQkmnNu8pvtwuLHsTB7rN/sXdatgPLcl ebtyubnFjzHmfiFeC+G338hx+IKQkS26yfkVk2xGaX6vrYpo7zBBYIZogDOB03nzx8CF xyNARaBl5C7pAZhlXBMcLakYsxk75mCHdUdnI4iP1B1bqyFpvEMrP0r0rNylwm0QcO1a F6ugJ+KFkPQPH4qcWODcgi8C00gk+SNxEF4Vsemml/7H4c/AYKByB9oRTTScdrkEc9eb 8LKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=aOQF4iSE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1si4361966pjc.33.2019.08.12.05.07.47; Mon, 12 Aug 2019 05:07:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=aOQF4iSE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728526AbfHLMHm (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:42 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35125 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728356AbfHLMHe (ORCPT ); Mon, 12 Aug 2019 08:07:34 -0400 Received: by mail-wr1-f67.google.com with SMTP id k2so18495761wrq.2 for ; Mon, 12 Aug 2019 05:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f27o2oE+oJHz4miX1Hf8EQ6LoL/TmaOJvKtMiSXbELE=; b=aOQF4iSEbmZZ5KY0hvPeBd8BItPqgtiP29FyURV+eKXNUeVijOxMVfVCNA5pEXVaji K05N5EAuVNZVkbw5HIZWo9Izbd+BKrdQneWJUE6mR8E+bFCl+BOy+iXJdUoH//looyMM i6Cd2+/WCQrlwCpG+k0SFfRmr5S5ndy2CL20JE4IcoCQ+HoOQ1dxHJ/Xz9zcpiee+ahQ UfLEAmK4UaIPrcB9cSrXtFILshBuSU1EESYiJu2DnqMEZBKC1EkoPtR6qYMeG7GqJFWZ LG4qrbnPerpCH8mP2DWE16gQQZT8R85kXCoRm6Ncr4Z/OVzVjb+ds4OvOnBsstAWEezE W5vQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=f27o2oE+oJHz4miX1Hf8EQ6LoL/TmaOJvKtMiSXbELE=; b=JILJgXuKKa7dyeRPRVg41DJW7fj7r6uGriXNVqToTfpwAPYEwK8Vor+G3E81vKYDpG ei3/Cy53Qala6DOQwyQGa4kpFBUZR2o+RkoiLXzngP85aehIvzMt1JY7z2l8js6pAUpU yBW1nAE6F4xmfBJWDwb6YnkIT1u5Z7nDhkMNaD5lb5PSQj7TCqd720PzxuPH2H9vfiNK 3ovpnSJITUnhy2lqiW1wTBGZxK3dF+KAhsaPBTO1FqMvvebHxpPJfvaz1mtFtUQGcllj fJ2krDAaPaNVHJ3toTbERrOBVAdYY1fyoy5/u0JzmHJAOIxwEn0PYu9o9CzvqlGR1rl2 AzaA== X-Gm-Message-State: APjAAAXL7XxyyfpeyDKZXPdSvU/x5sBlOmUozBecdGpMUn8wAI0KVjsu JPzjrzFVkFL+6K5Gb6uxZDgsVw== X-Received: by 2002:adf:a1de:: with SMTP id v30mr5234110wrv.138.1565611651778; Mon, 12 Aug 2019 05:07:31 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:31 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/8] drm/bridge: dw-hdmi: move audio channel setup out of ahb Date: Mon, 12 Aug 2019 14:07:20 +0200 Message-Id: <20190812120726.1528-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Part of the channel count setup done in dw-hdmi ahb should actually be done whatever the interface providing the data. Reviewed-by: Jonas Karlman Let's move it to dw-hdmi driver instead. Signed-off-by: Jerome Brunet --- .../drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 20 +++--------- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 32 +++++++++++++++++++ include/drm/bridge/dw_hdmi.h | 2 ++ 3 files changed, 38 insertions(+), 16 deletions(-) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c index a494186ae6ce..2b7539701b42 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c @@ -63,10 +63,6 @@ enum { HDMI_REVISION_ID = 0x0001, HDMI_IH_AHBDMAAUD_STAT0 = 0x0109, HDMI_IH_MUTE_AHBDMAAUD_STAT0 = 0x0189, - HDMI_FC_AUDICONF2 = 0x1027, - HDMI_FC_AUDSCONF = 0x1063, - HDMI_FC_AUDSCONF_LAYOUT1 = 1 << 0, - HDMI_FC_AUDSCONF_LAYOUT0 = 0 << 0, HDMI_AHB_DMA_CONF0 = 0x3600, HDMI_AHB_DMA_START = 0x3601, HDMI_AHB_DMA_STOP = 0x3602, @@ -403,7 +399,7 @@ static int dw_hdmi_prepare(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_dw_hdmi *dw = substream->private_data; - u8 threshold, conf0, conf1, layout, ca; + u8 threshold, conf0, conf1, ca; /* Setup as per 3.0.5 FSL 4.1.0 BSP */ switch (dw->revision) { @@ -434,20 +430,12 @@ static int dw_hdmi_prepare(struct snd_pcm_substream *substream) conf1 = default_hdmi_channel_config[runtime->channels - 2].conf1; ca = default_hdmi_channel_config[runtime->channels - 2].ca; - /* - * For >2 channel PCM audio, we need to select layout 1 - * and set an appropriate channel map. - */ - if (runtime->channels > 2) - layout = HDMI_FC_AUDSCONF_LAYOUT1; - else - layout = HDMI_FC_AUDSCONF_LAYOUT0; - writeb_relaxed(threshold, dw->data.base + HDMI_AHB_DMA_THRSLD); writeb_relaxed(conf0, dw->data.base + HDMI_AHB_DMA_CONF0); writeb_relaxed(conf1, dw->data.base + HDMI_AHB_DMA_CONF1); - writeb_relaxed(layout, dw->data.base + HDMI_FC_AUDSCONF); - writeb_relaxed(ca, dw->data.base + HDMI_FC_AUDICONF2); + + dw_hdmi_set_channel_count(dw->data.hdmi, runtime->channels); + dw_hdmi_set_channel_allocation(dw->data.hdmi, ca); switch (runtime->format) { case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE: diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 218a7b2308f7..be6d6819bef4 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -645,6 +645,38 @@ void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate) } EXPORT_SYMBOL_GPL(dw_hdmi_set_sample_rate); +void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt) +{ + u8 layout; + + mutex_lock(&hdmi->audio_mutex); + + /* + * For >2 channel PCM audio, we need to select layout 1 + * and set an appropriate channel map. + */ + if (cnt > 2) + layout = HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_LAYOUT1; + else + layout = HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_LAYOUT0; + + hdmi_modb(hdmi, layout, HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_MASK, + HDMI_FC_AUDSCONF); + + mutex_unlock(&hdmi->audio_mutex); +} +EXPORT_SYMBOL_GPL(dw_hdmi_set_channel_count); + +void dw_hdmi_set_channel_allocation(struct dw_hdmi *hdmi, unsigned int ca) +{ + mutex_lock(&hdmi->audio_mutex); + + hdmi_writeb(hdmi, ca, HDMI_FC_AUDICONF2); + + mutex_unlock(&hdmi->audio_mutex); +} +EXPORT_SYMBOL_GPL(dw_hdmi_set_channel_allocation); + static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable) { if (enable) diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index c402364aec0d..cf528c289857 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -155,6 +155,8 @@ void dw_hdmi_resume(struct dw_hdmi *hdmi); void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense); void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate); +void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt); +void dw_hdmi_set_channel_allocation(struct dw_hdmi *hdmi, unsigned int ca); void dw_hdmi_audio_enable(struct dw_hdmi *hdmi); void dw_hdmi_audio_disable(struct dw_hdmi *hdmi); void dw_hdmi_set_high_tmds_clock_ratio(struct dw_hdmi *hdmi); From patchwork Mon Aug 12 12:07:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171062 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747041ily; Mon, 12 Aug 2019 05:07:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqw/DYNZnWOF33lbD8mLKAGWYaSMMq8mPOKgIS4mUPbAC0aJ0OrV/EWIVAbtNbYcJZxRx7h7 X-Received: by 2002:a65:62cd:: with SMTP id m13mr29799308pgv.437.1565611661355; Mon, 12 Aug 2019 05:07:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611661; cv=none; d=google.com; s=arc-20160816; b=Sj9ETBzINwyVqF2QlA/FWedEZo9cbRCFwAj02hZJE28tPrOOdbRubGZbha6BM8OHvS Z+KN4tyrn2bAX5EJ9byNGomt436d5ZlVedt3okhMn7O+vrlqOzEY5pcoiapwlIlTyyxt D0wAYil6o+ansqz0NlfR3MT+qAYsjxsLQZ4S5JIyIIlO4XhOFsub7SaPqRP9TrN6RpgE c26/ek/BJdWNGKbBi/wF7htmRCbwgkr2d1rKXOoA5KGJllJ7ElTcAgVbpqsBx73WRNq8 IeUsMMSqQW/sOhEhME7y8uwp3vq4ireJ9C67AnWDcLETIDBzyOBPAU7odM3Gs7INE+e7 +GoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZGlThzviYa74KjZe20Ku3Xepd8/yx78CuAyvtGlIM58=; b=bK5vdxwGbhb4bpWALZFj1VOEWbf5HLuvASh79xU0W0lPQx/BW+fqjQ1DIjLZiIIRnX 3uVUA/Ud1vPJH1RjG9j6uvrBiVG+1noyEsrpY2ZnqeV7JiVbFQz1ABExukTU1FVNr71C Ss7o3N3CTWYbOruysHbsLdr3tYBNmXjJ0J0eHrzt+Jo+OdmNxSATVShcpIOYXb9cj55B qiDrrNr7rSDvIKAJMRB4qtk8VD7kax5aFesfWGL3tCDg3J24av18pPvvpHV1+LjsXprC qYHZ/hIPkSZMzYJMEztWFQDm1SgJS0hnkn52kVToKQdBkqSqBBa3ZDiN+TRUrnCUKrCi KV7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=DvTuwoTR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t34si23074029plb.29.2019.08.12.05.07.41; Mon, 12 Aug 2019 05:07:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=DvTuwoTR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728507AbfHLMHk (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:40 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33159 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726987AbfHLMHe (ORCPT ); Mon, 12 Aug 2019 08:07:34 -0400 Received: by mail-wr1-f65.google.com with SMTP id n9so104454262wru.0 for ; Mon, 12 Aug 2019 05:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZGlThzviYa74KjZe20Ku3Xepd8/yx78CuAyvtGlIM58=; b=DvTuwoTROuHbVQDxdqWmO0f39ZU0wzX4eGo8P1Qq0wZnKZ7jRQCMZZ/Q0RrCDo8hln aqatg2peAcIo1JBQXJUjXd/9raZ7v398jHI1ERa6NAPmzKVUIPIQ+98vi+EEYT0/o1pJ Anjes/w6rsqescn13KeKvhzXqbUsd+b9N+rxhNa4xNWcB7tM5rvItjoAXS2BP5m4d+do dXoTx1Sz7+XBQCK7TjC1nlEay/35okDkeq7KbV8j4nA9jHROcKJ+JTXqD4qqhFRCf9H1 cZLxSK3snuiK1FsPN9SijQgW7Ybuwe6e63LvcYiXt0gtnZEUbMV53tL5Cazvny95LWQ6 cqug== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZGlThzviYa74KjZe20Ku3Xepd8/yx78CuAyvtGlIM58=; b=Zox7u0KbDCD+YcHMEee9CtwTcMwWzwTQmFWZHEEwOLYhdFk3Sl7JPYU/1lP91ev3rw 3Uv68UZGAMfcv0/XOoDzXucr0NtblFT6/L7M62Vqsv/HjO4THsKFW1BfDWk+O2h2fxUw mB/fp4L+VuESzU9UFcCNErK4zfO2a7m5CKmoh1SzgWMKr7Hs+gA6B28gxA5u4HBuWIT2 v1Mn5z6f+RAE7y9AkRG/N83tSzQF29itXIlhIg/fnhU2B5FoYxMMh2G7lENiBqyRbkZr iwTA8NWgYAm3EpwG9kYn5B2R6RRxxgdEUP6bZtE0GMhDSOoVbtJKk2+zFJhxcQ/5pTE4 VZcw== X-Gm-Message-State: APjAAAXJZA9v9FBQGqxWA3kEe0Tfo/1K7rJc8kkgteCLftjVjz9hQUst 9NLtQDbKxSET6mFE93qh8tbgtw== X-Received: by 2002:adf:ec4f:: with SMTP id w15mr38067769wrn.311.1565611652662; Mon, 12 Aug 2019 05:07:32 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:32 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/8] drm/bridge: dw-hdmi: set channel count in the infoframes Date: Mon, 12 Aug 2019 14:07:21 +0200 Message-Id: <20190812120726.1528-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set the number of channel in the infoframes Reviewed-by: Jonas Karlman Signed-off-by: Jerome Brunet --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index be6d6819bef4..bed4bb017afd 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -663,6 +663,10 @@ void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt) hdmi_modb(hdmi, layout, HDMI_FC_AUDSCONF_AUD_PACKET_LAYOUT_MASK, HDMI_FC_AUDSCONF); + /* Set the audio infoframes channel count */ + hdmi_modb(hdmi, (cnt - 1) << HDMI_FC_AUDICONF0_CC_OFFSET, + HDMI_FC_AUDICONF0_CC_MASK, HDMI_FC_AUDICONF0); + mutex_unlock(&hdmi->audio_mutex); } EXPORT_SYMBOL_GPL(dw_hdmi_set_channel_count); From patchwork Mon Aug 12 12:07:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171065 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747344ily; Mon, 12 Aug 2019 05:07:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEmZxFjb3bwX/7HoeMvDcJprH7Ofz/fCL8KwjaePW2aJbKDMptOpK+YS1q2GfmM5dzdHKs X-Received: by 2002:a62:ac11:: with SMTP id v17mr35331985pfe.236.1565611673725; Mon, 12 Aug 2019 05:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611673; cv=none; d=google.com; s=arc-20160816; b=LZ+7eh1M7zWww/2zq6tc+jF45jJdueARENXOUDXRPAy19Vi4zci1vab7Z0p23gZzB5 5EesajwkPKc0UrTVWgSbxDm9wcRcPPGnmxqZ2mlMFH2NCPIss9+IzNMVJKnqS+gjjX+e zmwQVJYHpA8tDScR1bHN1e1ULdyBa7KWmCcVgxiNKaY9NKD+Ru9AnMl2n4gYcQDfIHzT ZNF548xup21czECanB+74YcFyKy6cqqGFuSaV356ENSGKkbWYXH42J4ChLY0E6xoUaKY dk16BrM8zRHhc8vBkc0z5Sry0NCvOWeVYbRZ95KfjC+HDv9z1V3dhI2J1nE/dPbbQOaq cn0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1wxGGO+eJqHNHPL320ZApEdBEJuHkt1WmWaw3TLqcWg=; b=iiW8WS/o01syc79VloEI949Y0IMMm9hY4bFDd8fBh7+twQDYmciTrYr6uw226fQOcs XlXNFXi0d1t5E6rnleHQ8o545aFVHdUtqXkEcfg9crYCNtUCW371O3MCS/RawpB/4J6G oSSayZHD2ZwlYTnIIlPvDZdDHvBKae2SVsstsEc9Ph6ma6C90PIb7PbPs2spi6yybbbD qzIP/v0QsCH1JLHtV33kXt/CvsW7aPzTyY4vsvx768rMlVOU2/nKWt24dMTBzU2Hf925 48CxgZ+eE7rmKrAmqvpURmTY25SB3OzQVwcFXM8aCQvcHnA2YefZHsDfw//Zr7Fnm8Vs kKFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=mj7VPqoP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x8si9799540pfj.264.2019.08.12.05.07.53; Mon, 12 Aug 2019 05:07:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=mj7VPqoP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728489AbfHLMHi (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:38 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35450 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728422AbfHLMHf (ORCPT ); Mon, 12 Aug 2019 08:07:35 -0400 Received: by mail-wm1-f67.google.com with SMTP id l2so11550234wmg.0 for ; Mon, 12 Aug 2019 05:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1wxGGO+eJqHNHPL320ZApEdBEJuHkt1WmWaw3TLqcWg=; b=mj7VPqoP3QaypYZk5wdhlVro9KJGAVFvrtL+ktS1443PAbjOUKqGny5CD/pIW5bwl3 By1MKtNas4S3X0b1lwcmcLVPc6255JAMYCn2iAraSMcyV4K1BbTH0G1SSb5cO4QVt+hD 7bo0J0Rjcv/ydPYjs+WmXR64f7gXNpqVUx/3b6/+ynaviRLMmGPtlmvf6dyKfzSU3KPx yca4gQRCBh1PJ6440JPgr8bKQwOzWTbTmuRNmO1rdoCENmZzHLT6Wp2piNEN5PPokr0Q Kv9ujN38fe+RAP8cys4QHft3PyKqgD//+9PLkzVbz8jj/GxP+gsIN4pIpWPsAdxDKmtn WG9Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=1wxGGO+eJqHNHPL320ZApEdBEJuHkt1WmWaw3TLqcWg=; b=NnC9xqOA3ndXd6Eoru89fHZjHaKK5SEy2h9DADWR06c0goCBlf8+zu76mElyl9MEWG XWVCSC/yIYouSOMTdxoGU2ndEMu6Xa8EfwNKHwUrYt5F49lLtdJ/tnicMcSkzpJtzs9W yY+JKu63Fq7sdzM5/5wEjjrsyyFhO+MaIcSfxSS9Udtp0V32JdlMTN0dfUlIbTRG0RC3 AEjTBJr/yg02rVmf4rehUgqOdod67ASVUaYkh9oWm+gDRXAMHIVkXDsPSOXw6UfDYg2r nw4QOeD5RHVlWFI6WwepBtUaxk/9A23ORJc8Qd/yHHjuvOmw9jBops4pd/mCNKuEF9Gq DPCQ== X-Gm-Message-State: APjAAAW+HelS3h4HGO+tsOX2hbxx45HPVQOTtkryszSx/JuFRHvJm3Ub cCsaUvRhQduudBFpqrWjZh5bhcjgUds= X-Received: by 2002:a1c:9d8c:: with SMTP id g134mr7473128wme.174.1565611653536; Mon, 12 Aug 2019 05:07:33 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:33 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 4/8] drm/bridge: dw-hdmi-i2s: enable lpcm multi channels Date: Mon, 12 Aug 2019 14:07:22 +0200 Message-Id: <20190812120726.1528-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Properly setup the channel count and layout in dw-hdmi i2s driver so we are not limited to 2 channels. Also correct the maximum channel reported by the DAI from 6 to 8 ch Reviewed-by: Jonas Karlman Signed-off-by: Jerome Brunet --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index 2b624cff541d..caf8aed78fea 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -84,6 +84,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, } dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); + dw_hdmi_set_channel_count(hdmi, hparms->channels); hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); hdmi_write(audio, conf0, HDMI_AUD_CONF0); @@ -139,7 +140,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev) pdata.ops = &dw_hdmi_i2s_ops; pdata.i2s = 1; - pdata.max_i2s_channels = 6; + pdata.max_i2s_channels = 8; pdata.data = audio; memset(&pdevinfo, 0, sizeof(pdevinfo)); From patchwork Mon Aug 12 12:07:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171061 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747004ily; Mon, 12 Aug 2019 05:07:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4w/P7RkWNu8RLrz5tdrrurDYOJPM1v0hnSJ/ZoL049TJr/pNY41y3F7yFN+pf2sU8aG/1 X-Received: by 2002:a17:902:1e6:: with SMTP id b93mr32160945plb.295.1565611658888; Mon, 12 Aug 2019 05:07:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611658; cv=none; d=google.com; s=arc-20160816; b=HdQ6vxM9lNtX0w4Vu+ac5zHyu71Gxvk4u5v30I84T9plOSa4OGWTpo/YH17HANyeR4 y5kLn0kCnYNFoR06EFFfkYDxF2W1KNsPk9EVAZ639hS5LoqpZKtcMLTDvxhuUIUDDl/9 dv+HaAm3q+XshHohvHkTfZMH8pempzldhettbm0l+17V5XzFSZupDJjNHeZx1RN7O+MW eh2KLLOB6xzIJ9wAf04cvfOTkwR4Hn5NF/Rv4y8i93ubBu4gqk3yeA1aPFlZXjp453e8 xqD0hxnH4B6mGaR4x/LtLiQ+D6DBRpriDIXs+hMVqXtJcNqIj17bVPT3IZt+rDAXja3z Lj4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dBAKQK2TWb6YSZRcSfCJBhSpAFaSf3bVHWGaQNvZ07Y=; b=mzIqPz43cDgOqqaM9wSadiv5geR41i/ky15uNhwa86BFgYreO9RArp7W7PxqE5T1xa 0OS2lf724D8al+OenaVnC2XOIaVZ+TNc+DlL2Flvhsv01R/1qWaGf9h9oNJQEK7eE1Ot XkGsJl9Q0XwKpBXj5hGTg0BqIgNfcXRZoo2oG1340P34rNnpuniiVyuhm5vsAFmpvuNW uOsCgaV3FmtRoLv/28VzZRzkYnbBzLeVSAwWnXOXHCs209gGIhUegIRgn3RF+UxvWLuH MOWcD0dp46YtFzTRmPLygd+3ZOwx4GSTkWDyCZqUxmbm+36Zc/xCa0DSulDKg6ImLS8w c+gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b="L/jjE0Z+"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t34si23074029plb.29.2019.08.12.05.07.38; Mon, 12 Aug 2019 05:07:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b="L/jjE0Z+"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728469AbfHLMHh (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:37 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50955 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727975AbfHLMHg (ORCPT ); Mon, 12 Aug 2019 08:07:36 -0400 Received: by mail-wm1-f68.google.com with SMTP id v15so11926308wml.0 for ; Mon, 12 Aug 2019 05:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dBAKQK2TWb6YSZRcSfCJBhSpAFaSf3bVHWGaQNvZ07Y=; b=L/jjE0Z+uh9feCmkguYc7tOOBvXTJ2DTkbUR4kDzZ6isTnRr7TZDjGDEF6mDLN8STZ 3GZGeVOI/dBYGZa6vyrOZB8Dj6VWwEAJR0uv1rxGJVEZvh9DW41NSo4aMra+MPz5b36A UFoTyytB4L/uzrZZdbjUV1mDHzMgHzpls39fSbcyuOrCahhcac5jv3fY+uyTA4nh4OXW qrzV7pQHNBFW3NqoZTG8Y1ns1WE5CEI7I5bgg+t2saPZdgk22y7ggPFf7dn3/HLwODVw PeX5EWRAKOrympN/IGlN4Qwt0NrARSKDvPGYJehhTQcksDpIWpcYJluUoUUbSfhndXbz dXlA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=dBAKQK2TWb6YSZRcSfCJBhSpAFaSf3bVHWGaQNvZ07Y=; b=KhswzfV0sBJub+o1pofpVrc1TDHoR7IX94Zr8PnhZoWUeSNKhKRtk9kebVxSsQ7eNk a0F0r8XXkGge2kVz7f6HDDQrifZyhF7s9iveP0fICGIdX6BUCjiMlOkMuGTnaYvATvCE INKgjbtvd3TZZG+cDZHnEgmgpwc+TnDW2ylQh0xPgI+CRV7smAUa/GSFBsZtAOaa3Eer FJpQYYczP8+nJLyEsyhEu6/7MIhU3AbkkPlE+KERP0bNJevTtj17KbLXKutcoB3gMKps Lw6qHci8gFJg2abNQl0a2aBYWcklbtYTZy0yJAx1wRLzGMrPD9QU8+nLj5l6UFoBD3UH X8rw== X-Gm-Message-State: APjAAAV3ayjv3H4I5DwJC8B1hab76EzUj+B3fLAGBdTCpaZ9FCG5l5Yl Xj/rX8dK/q+Pmfbt1+TBEgzGPQ== X-Received: by 2002:a1c:f409:: with SMTP id z9mr27445823wma.176.1565611654629; Mon, 12 Aug 2019 05:07:34 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:33 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 5/8] drm/bridge: dw-hdmi-i2s: set the channel allocation Date: Mon, 12 Aug 2019 14:07:23 +0200 Message-Id: <20190812120726.1528-6-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org setup the channel allocation provided by the generic hdmi-codec driver Reviewed-by: Jonas Karlman Signed-off-by: Jerome Brunet --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 1 + 1 file changed, 1 insertion(+) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index caf8aed78fea..0864dee8d180 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -85,6 +85,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); dw_hdmi_set_channel_count(hdmi, hparms->channels); + dw_hdmi_set_channel_allocation(hdmi, hparms->cea.channel_allocation); hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); hdmi_write(audio, conf0, HDMI_AUD_CONF0); From patchwork Mon Aug 12 12:07:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171067 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747516ily; Mon, 12 Aug 2019 05:08:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqyREmYYKEAw1FXdA6lGRf87GbRZcCAdsCM26NgEQH5hurps9fPXFHMzlXNMGlp4n2ypNOYH X-Received: by 2002:a65:6817:: with SMTP id l23mr29999450pgt.46.1565611681369; Mon, 12 Aug 2019 05:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611681; cv=none; d=google.com; s=arc-20160816; b=RFgX1LSlu57ND4RLtpjfjLzg6IfniJx8d/loZnG46fPPawS73n9M5Q8YcvvDlGW2wV 1oVAbXwe8u0C6kHjGyZpohFI8Jc+ZUiaXsMy7T+iysq6olGwK5ra8WzrUtBU8s2/nkvq CxauCkv/DGoyc0WeaJKezaOQ+tr4c1HQldEGr+3b11nTt5Ojzb7fNAqD/zzotQKpGdGU RToVLvuzPtiHiX0X/OfCYZ8I51cy4s/5AC9j2rb5xpiMVGVTdVkyZQPTsc730Y7TrPW1 U02C+/KywQTtdC6VZMJDrFLffYftiF1p+WlbCuN+anY+ks8+inVzpe36mCAnFiR8hP8Q 1uvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+7rNGhftPAm98gxQzspW2Bl38AWTm/sVwK1bJUwi+9s=; b=McMQigxfeHTkgogMiPv5ajYcg8+6+GRHMwwdU5bQBVEMV0vgin/S5V6MUvzhm8FtCP To6nwmj2cmIoJ+xNJO4Q1HXNuVQfKk0jcZg/qApDXaZvq3IylkRPmeSeuR3+nSd65vzu Cuf0LllMeEhCD/cMBUEV5sJBRaX/vIcDtHszKbmMR7dH6HyUeJBJxLZdV/xzm89U4/hU A8sVE5e/6JbFvkVeU5ls9RDBDDFRYGG2sVfvn3NoIHIuY3WV8SQgKKjSdVsKKFh9IhO8 Gr435cyZM9aPvPE3ZxpRgds7DKeL0c0N0Xd3hauYC7nFKDj2qGVY0ME6gPq430SA6XCc EaJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=rDwjvizq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v11si54867088plp.304.2019.08.12.05.08.00; Mon, 12 Aug 2019 05:08:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=rDwjvizq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728584AbfHLMIA (ORCPT + 28 others); Mon, 12 Aug 2019 08:08:00 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:55271 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728441AbfHLMHh (ORCPT ); Mon, 12 Aug 2019 08:07:37 -0400 Received: by mail-wm1-f65.google.com with SMTP id p74so11928122wme.4 for ; Mon, 12 Aug 2019 05:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+7rNGhftPAm98gxQzspW2Bl38AWTm/sVwK1bJUwi+9s=; b=rDwjvizqSw6Jz6AkOORykYkiAVItW36h9yIqrSC6nXnNDmDCRZtcTAJJCA4PBosGnH udRGdq/OsG7HCT1oFBaXuW0dQ6f9+s4m2z+tnI96mdsZGFqBYABurZMO8EQtvQgJOsWG ZuPZy9FPI8wgr5HIADP9ult6InbBe4KL1ExExYGEU96fwU9dimdR6xtIHI9XAhqE3YvC fSlYBsOBJdwSPg5xqueM2fiMOQD/huROetdJhaDMeb5qjgGVvpTUq98oh0/ytyf5dl9C +i2+2g+Mu+TW0YXap8l1FGYxX7g7ietxEAmQtKO9SlSKPgGROCnAuQQKJm1wJBCUncWw UN9A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+7rNGhftPAm98gxQzspW2Bl38AWTm/sVwK1bJUwi+9s=; b=HXWVdbc9bujtDdr585o7KBbGnyiyEJAXmewi61VwINw4Awo+a/TtwMazChjFDfXY1y 6GB/yAnU+AKaPh3dXQrAgwO6lbwDPT5alu4Fw1QoyYPVtYZuC1s5Gd71wxmG1o8A791U 9D3tBdMKz572mIPT3qckJ7AynzzqRvr+WF/ZM3MtytRgm8R2IQk7ZC4R3eibBATblQSI FCPCb1M4eZjbwmIptUjoRwR5zoFUoWymxITZu2X1MVDFWqcb9aFIflTlBeRBWn/4rQLG CaXMueJ6AdxmPte/x1txYZVWZPdop3foeQIwhgnC1JwdkTJX6xtHt/H2ZafWie0dqRlS OOBA== X-Gm-Message-State: APjAAAWE+ri+C9Cpt2ed4oRvy0JvITUQAHNI3nywHAsyrZkBZeqzRRD3 EI0JMEJBbZjPXsFho9AuOg7YQw== X-Received: by 2002:a1c:1f41:: with SMTP id f62mr28067454wmf.176.1565611655458; Mon, 12 Aug 2019 05:07:35 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:35 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 6/8] drm/bridge: dw-hdmi-i2s: reset audio fifo before applying new params Date: Mon, 12 Aug 2019 14:07:24 +0200 Message-Id: <20190812120726.1528-7-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When changing the audio hw params, reset the audio fifo to make sure any old remaining data is flushed. The databook mentions that such reset should be followed by a reset of the i2s block to make sure the samples stay aligned Reviewed-by: Jonas Karlman Signed-off-by: Jerome Brunet --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 6 ++++-- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index 0864dee8d180..41bee0099578 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -49,6 +49,10 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, return -EINVAL; } + /* Reset the FIFOs before applying new params */ + hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); + hdmi_write(audio, (u8)~HDMI_MC_SWRSTZ_I2SSWRST_REQ, HDMI_MC_SWRSTZ); + inputclkfs = HDMI_AUD_INPUTCLKFS_64FS; conf0 = HDMI_AUD_CONF0_I2S_ALL_ENABLE; @@ -102,8 +106,6 @@ static void dw_hdmi_i2s_audio_shutdown(struct device *dev, void *data) struct dw_hdmi *hdmi = audio->hdmi; dw_hdmi_audio_disable(hdmi); - - hdmi_write(audio, HDMI_AUD_CONF0_SW_RESET, HDMI_AUD_CONF0); } static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component, diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h index 091d7c28aa17..a272fa393ae6 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -940,6 +940,7 @@ enum { HDMI_MC_CLKDIS_PIXELCLK_DISABLE = 0x1, /* MC_SWRSTZ field values */ + HDMI_MC_SWRSTZ_I2SSWRST_REQ = 0x08, HDMI_MC_SWRSTZ_TMDSSWRST_REQ = 0x02, /* MC_FLOWCTRL field values */ From patchwork Mon Aug 12 12:07:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171063 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747117ily; Mon, 12 Aug 2019 05:07:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZNKEqIB7klN6cP31jKeeBIqtWrokguOPHS2QCDNO15inm2ZBKRydUWBieMbHBy9YUAkBJ X-Received: by 2002:a17:90a:8688:: with SMTP id p8mr23518121pjn.57.1565611664380; Mon, 12 Aug 2019 05:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611664; cv=none; d=google.com; s=arc-20160816; b=elMnKuaw8yrbY8yunf90o/FyXlHHMDNkkM9nDrRJhLb2ijlwerj+U4Ts2thnKcrA6y RAg48ZeNuVc2LtGahdkRtjfSojj/tElZUnsmLQT3C2vRYLKKFuLn+MWbPVJieLWZ1M8A TNp9OddvhjYeHtYovKO3p3/WdGgWlDKc97W5gUUIPkB90krm+AXNKNbWMf9YycaiUTfj Wo767W0AMgHyshPQvL0OArBqiTd5X5iqMm5Og0MC0SzidOVYDiRIs2fmnEBRchD4NRja 2Z5A10VtG+Lma/Tz6n4EZgpMpnUtl9GRn0dpzDeM6EQXwLbiPt3PRpRyC+XDVH88unyu tmwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nyk3iRwUiWOF3HR8AgEI8oTD0AAO9L4Qd9ulSVgUQuc=; b=gE2GFqT/Mmornhz7D0Za3n9+VwJhnnv54s0zc54JMd/PN7fqYd8K3BJYiosBco7n86 53HaX6O3+1xDTNuUEdlR4BjmspWajzN6d/Syiw+gxP6hAit8tEUQ681fef95KzNRXajG p4CfoRjhVNaY4CSPrixHEwuIPsNV6dML3rVtjpYA4d9OqvE/Yy/Lw9wnTkFnkmrNu4HO 7+Vyl6/+i192RITn2Teyl8gebgCT5UeDdj0ZGC2/+k0CYwvxOYF3yO/xLCaFpuPowIC5 +XcA7v/w/2WjigroBCxN7Ca6dgBq/I6/saa6B7X1vl7H0RA/ki+6TwNMqVvrYaJ20OVt zY8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=daHHObEV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t34si23074029plb.29.2019.08.12.05.07.44; Mon, 12 Aug 2019 05:07:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=daHHObEV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728545AbfHLMHn (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:43 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:52118 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728445AbfHLMHi (ORCPT ); Mon, 12 Aug 2019 08:07:38 -0400 Received: by mail-wm1-f67.google.com with SMTP id 207so11932588wma.1 for ; Mon, 12 Aug 2019 05:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nyk3iRwUiWOF3HR8AgEI8oTD0AAO9L4Qd9ulSVgUQuc=; b=daHHObEVwiPB5m8eB3TinS4M9hhoYOX7OGD3cCnIcEdu8mEBbC2sxvbHgwNQgNQaGl e+ADZVLpFJLcl5mKHLragQdiafg85cuqpCUuGO05kZO+gqWvdMosoWdf76Lir6wDtR+G wnM/evLYE5mIEGNMDuMjreFZbxAt2EM/BzD4bWna14viPvYztIKdPE8Jjk2RtbvecAiH +vTiUF5wWddKT/m+Wal8DQpROpSVRSZ7RWDQLYKJ0cneQ7GBQEZGV/d/J3AAidyIBRzk kxtw4nWL8qMqRra9ftu6k3t/ezDcKlv0PBbJUX4418BaYieMPY6X3fasAC7Y3ddZnMCg N1ig== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=nyk3iRwUiWOF3HR8AgEI8oTD0AAO9L4Qd9ulSVgUQuc=; b=Zn/gY2F6O+JKMZr8qPLEDhVWcjHy8stxiZ0lU+y7tfx4SUYUa+hFTxQNAjheNcLDkA R3b2sOQhUnEtLm4xgbOBsBeO43J0sd8NMOVoauvVOURvI59RsG5gN2ITbAZ1G7VSBh6t N8Nq3h6scvIPXkJBFq4LRlTYyRTsPsXAfxY1Myu0oTSveupbtW4/FKgsSf0EZOzHIVx9 caqQhaS4UHVcbf9o1G1pQsHmqsEpLQJj2/EdyVoDh1CZy1TW9aw6XjSaXrXTSFSP8iCA xpGLDL92oUehw+Hon3zods/YdNKwCjCiH3v333HVRQHEaBnbBG4UZk3ZgZazwI4f+Zga 2LOA== X-Gm-Message-State: APjAAAWu7GJbmfvbnThfkjjYD5sdJaE5Cmh6ONEKIj5C3Ez9CjS3ed2i OjJvHji/ub9iyL2nToOOdoYFoQ== X-Received: by 2002:a1c:6641:: with SMTP id a62mr26440820wmc.175.1565611656356; Mon, 12 Aug 2019 05:07:36 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:35 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 7/8] drm/bridge: dw-hdmi-i2s: enable only the required i2s lanes Date: Mon, 12 Aug 2019 14:07:25 +0200 Message-Id: <20190812120726.1528-8-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enable the i2s lanes depending on the number of channel in the stream Reviewed-by: Jonas Karlman Signed-off-by: Jerome Brunet --- .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 15 ++++++++++++++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 6 +++++- 2 files changed, 19 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index 41bee0099578..b8ece9c1ba2c 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -54,7 +54,20 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, hdmi_write(audio, (u8)~HDMI_MC_SWRSTZ_I2SSWRST_REQ, HDMI_MC_SWRSTZ); inputclkfs = HDMI_AUD_INPUTCLKFS_64FS; - conf0 = HDMI_AUD_CONF0_I2S_ALL_ENABLE; + conf0 = (HDMI_AUD_CONF0_I2S_SELECT | HDMI_AUD_CONF0_I2S_EN0); + + /* Enable the required i2s lanes */ + switch (hparms->channels) { + case 7 ... 8: + conf0 |= HDMI_AUD_CONF0_I2S_EN3; + /* Fall-thru */ + case 5 ... 6: + conf0 |= HDMI_AUD_CONF0_I2S_EN2; + /* Fall-thru */ + case 3 ... 4: + conf0 |= HDMI_AUD_CONF0_I2S_EN1; + /* Fall-thru */ + } switch (hparms->sample_width) { case 16: diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h index a272fa393ae6..6988f12d89d9 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -865,7 +865,11 @@ enum { /* AUD_CONF0 field values */ HDMI_AUD_CONF0_SW_RESET = 0x80, - HDMI_AUD_CONF0_I2S_ALL_ENABLE = 0x2F, + HDMI_AUD_CONF0_I2S_SELECT = 0x20, + HDMI_AUD_CONF0_I2S_EN3 = 0x08, + HDMI_AUD_CONF0_I2S_EN2 = 0x04, + HDMI_AUD_CONF0_I2S_EN1 = 0x02, + HDMI_AUD_CONF0_I2S_EN0 = 0x01, /* AUD_CONF1 field values */ HDMI_AUD_CONF1_MODE_I2S = 0x00, From patchwork Mon Aug 12 12:07:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171066 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747387ily; Mon, 12 Aug 2019 05:07:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpaqU5dPytHF01SjJ3uWLsGFvpYpmQFNvgDRZosfsd0dGCePOizO0qQ5vayHF6MSAhtGG3 X-Received: by 2002:a17:902:f216:: with SMTP id gn22mr31784846plb.118.1565611675747; Mon, 12 Aug 2019 05:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611675; cv=none; d=google.com; s=arc-20160816; b=GRDGbo4LCGsQeJvI+xxWcVWJ45+N1hgb09ZOvd5GK3SYtQIqkW3IDLBiG5LjiH/p7c WSqrK6xwETS+DLEog0hZFwOu+PCFR2E98ywwanjzqs8s8g0JLiAgv4Ouj+lJJ4woeFan w+5ZquGDxtKor8MbS5dhUxqnWJPrgEuJ4BSQYDkIXjk/6c5bSelJQnPChW7ErFSTYrqT gCVmy4U4tOCJEBgb5YDTZ/QMUAtJkhfxK7FakKkIhsOsI6mxoj7DtLPYBi9TALqho3H1 WgW8qyhhiqWUkdxE84cZ++0W/HMEqwYoHbsrre2Fm3wvbQh4RtTiPs9v7x+u/HHLeV2m z3+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jc9/cSBhIwTuXPvQDL6txYFXAJblot8ynaeVI0KB+kI=; b=ydAJ6BLmAfxt7swfP4FLSIu9wM3pDmgy0Y0eRr+gR4mdW6RzLe8Cvbmd3XW3wnAdPV f7jgIs9/Vo2bPAdHdX4C0V3wNucqEpSzh+OStfdQ+HW+e48ZKYddaYsXUyoI/0SjTdYF 50extlZ/E0FxXxA3OKVY7hyLZ/rwdR5tVcon1QaGVSrdD8vBqAegkGl7UkgT6M9kNdad zxeCw0NjDt3fAhBD2WZ+BpOF2yO3n6Ml8wCYNVHhGClK5Hr2Rm/7rQxmPbwuHFZ2leke HbJiuSxLpGvKUDy88xUz+UuF5wChmOMcXKwH8dwKZHDCsb0YVDCzYRcDy9M6WbeRlZUg 8MWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=JCgKaHji; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x8si9799540pfj.264.2019.08.12.05.07.55; Mon, 12 Aug 2019 05:07:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=JCgKaHji; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728570AbfHLMHy (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:54 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52120 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728471AbfHLMHi (ORCPT ); Mon, 12 Aug 2019 08:07:38 -0400 Received: by mail-wm1-f66.google.com with SMTP id 207so11932629wma.1 for ; Mon, 12 Aug 2019 05:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jc9/cSBhIwTuXPvQDL6txYFXAJblot8ynaeVI0KB+kI=; b=JCgKaHjiK9nXytoYeRJc1oNQnDr/iTA4L8Cs/nMSQTvwrHCjI8V6q/fMKElW1iq4kH QVfNygjYCJLIR2X+73dkH1YWR5jd4IZKoHby+j8qpmF4XhZajY4Kjk0JETHWN8nefT3I BfO806OgbneAJNQFFiN1knQc1xLRpBUENeHPFywv44hICM1gob6lINnEr6lMqhzVnZI0 45ko6hz6x7sRZ4R5nYlMEf5MlYQPrQ0o3lAqjqwFZ8KdHKkua1sCJd0NOmLrjZP+qAlF e2qBWgoDEBeqiW5bZLuERfieGV41O7+oENtJiTUejXx6Sj1XEVjw8F1jz4H8xldgpDiF UFHg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jc9/cSBhIwTuXPvQDL6txYFXAJblot8ynaeVI0KB+kI=; b=AZOnZejPrJ7yvj5lPUuX2Xz+Xa/uKqZKACxShTfmiULZu4tktHDDiAI0COb1fDVzug Jz6eQ4FSSE0tXTWpaM6kLGddB3iIt5kmV/myJSXwwK63s7SxJ4wOfaicESBJUqdPXzYc 8sDY8Rd95LAYrdWWfnMDweBuYzleOdRzZZXB6C7q608PlG0gW5HfOjxFzQ51ZpfJJezp zeEqwkNC1/jTZc40q+OYR9HShr33PjmCopO4DBWyzsiXZW7Qrs6k/vNbNTEE42S6GD8V j8eEQBalTS+laOlgmbvhEqaPVVZpUJd0pkEx91n7nfSu6C85DsH5y4zXZMCXfBbBDfji hSsQ== X-Gm-Message-State: APjAAAV/9oYqzwbdE+W01EIW7IzvRSUkoNhN8hu+UDDEohQ+3RdCZRq0 ysVNp0wABbW8tXmEA2BRirAoNw== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr28033074wmg.111.1565611657147; Mon, 12 Aug 2019 05:07:37 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id j9sm1883415wrx.66.2019.08.12.05.07.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:36 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 8/8] drm/bridge: dw-hdmi-i2s: add .get_eld support Date: Mon, 12 Aug 2019 14:07:26 +0200 Message-Id: <20190812120726.1528-9-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide the eld to the generic hdmi-codec driver. This will let the driver enforce the maximum channel number and set the channel allocation depending on the hdmi sink. Cc: Jonas Karlman Signed-off-by: Jerome Brunet --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 1 + drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 +++++++++++ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 + 3 files changed, 13 insertions(+) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h index 63b5756f463b..cb07dc0da5a7 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h @@ -14,6 +14,7 @@ struct dw_hdmi_audio_data { struct dw_hdmi_i2s_audio_data { struct dw_hdmi *hdmi; + u8 *eld; void (*write)(struct dw_hdmi *hdmi, u8 val, int offset); u8 (*read)(struct dw_hdmi *hdmi, int offset); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index b8ece9c1ba2c..62e737b81462 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -10,6 +10,7 @@ #include #include +#include #include @@ -121,6 +122,15 @@ static void dw_hdmi_i2s_audio_shutdown(struct device *dev, void *data) dw_hdmi_audio_disable(hdmi); } +static int dw_hdmi_i2s_get_eld(struct device *dev, void *data, uint8_t *buf, + size_t len) +{ + struct dw_hdmi_i2s_audio_data *audio = data; + + memcpy(buf, audio->eld, min(sizeof(MAX_ELD_BYTES), len)); + return 0; +} + static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component, struct device_node *endpoint) { @@ -144,6 +154,7 @@ static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component, static struct hdmi_codec_ops dw_hdmi_i2s_ops = { .hw_params = dw_hdmi_i2s_hw_params, .audio_shutdown = dw_hdmi_i2s_audio_shutdown, + .get_eld = dw_hdmi_i2s_get_eld, .get_dai_id = dw_hdmi_i2s_get_dai_id, }; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index bed4bb017afd..8df69c9dbfad 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2797,6 +2797,7 @@ __dw_hdmi_probe(struct platform_device *pdev, struct dw_hdmi_i2s_audio_data audio; audio.hdmi = hdmi; + audio.eld = hdmi->connector.eld; audio.write = hdmi_writeb; audio.read = hdmi_readb; hdmi->enable_audio = dw_hdmi_i2s_audio_enable;