From patchwork Sun Mar 1 02:52:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yakir Yang X-Patchwork-Id: 5906821 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 78B91BF440 for ; Sun, 1 Mar 2015 02:54:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69D31202E5 for ; Sun, 1 Mar 2015 02:54:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7DFDA2013D for ; Sun, 1 Mar 2015 02:54:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRu1p-0001AA-AV; Sun, 01 Mar 2015 02:54:49 +0000 Received: from regular1.263xmail.com ([211.150.99.131]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRu1n-000111-GA for linux-rockchip@lists.infradead.org; Sun, 01 Mar 2015 02:54:48 +0000 Received: from ykk?rock-chips.com (unknown [192.168.167.139]) by regular1.263xmail.com (Postfix) with SMTP id B2BBE33E0; Sun, 1 Mar 2015 10:54:24 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id E29F3456; Sun, 1 Mar 2015 10:54:20 +0800 (CST) X-RL-SENDER: ykk@rock-chips.com X-FST-TO: djkurtz@chromium.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: ykk@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 13520PIY3RI; Sun, 01 Mar 2015 10:54:22 +0800 (CST) From: Yakir Yang To: djkurtz@chromium.org, dianders@chromium.org, linux-rockchip@lists.infradead.org Subject: [PATCH v4 11/15] drm: bridge/dw_hdmi: add enable/disable to dw_hdmi_audio callbacks Date: Sat, 28 Feb 2015 21:52:25 -0500 Message-Id: <1425178345-2380-1-git-send-email-ykk@rock-chips.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> References: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150228_185447_919523_D67C1492 X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Fabio Estevam , mmind00@googlemail.com, marcheu@chromium.org, David Airlie , Greg Kroah-Hartman , Yakir Yang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Philipp Zabel , Andy Yan , Russell King , mark.yao@rock-chips.com X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add enable and disable callbacks to dw_hdmi_audio interface so that dw_hdmi_audio can enable and disable the dw_hdmi audio. Signed-off-by: Yakir Yang --- Changes in v4: - Rename "hdmi_audio_*" to "dw_hdmi_audio_*" Changes in v3: - Delete hdmi_audio_config interface and modify audio clock control functions Changes in v2: - Add audio config interfaces to dw_hdmi driver drivers/gpu/drm/bridge/dw_hdmi.c | 62 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index 16b8098..54185e2 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -147,6 +148,11 @@ struct dw_hdmi { void __iomem *regs; unsigned int sample_rate; + + /* this audio mutex works for audio clock control */ + struct mutex audio_mutex; + bool audio_enable; + int ratio; void (*write)(struct dw_hdmi *hdmi, u8 val, int offset); @@ -1245,6 +1251,53 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi) hdmi->phy_enabled = false; } +static void dw_dw_hdmi_audio_clk_enable(struct dw_hdmi *hdmi) +{ + hdmi_modb(hdmi, 0, HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS); +} + +static void dw_dw_hdmi_audio_clk_disable(struct dw_hdmi *hdmi) +{ + hdmi_modb(hdmi, HDMI_MC_CLKDIS_AUDCLK_DISABLE, + HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS); +} + +static void dw_hdmi_audio_restore(struct dw_hdmi *hdmi) +{ + mutex_lock(&hdmi->audio_mutex); + + if (hdmi->audio_enable) + dw_dw_hdmi_audio_clk_enable(hdmi); + else + dw_dw_hdmi_audio_clk_disable(hdmi); + + mutex_unlock(&hdmi->audio_mutex); +} + +static void dw_hdmi_audio_enable(struct dw_hdmi *hdmi) +{ + mutex_lock(&hdmi->audio_mutex); + + if (!hdmi->audio_enable) { + hdmi->audio_enable = true; + dw_dw_hdmi_audio_clk_enable(hdmi); + } + + mutex_unlock(&hdmi->audio_mutex); +} + +static void dw_hdmi_audio_disable(struct dw_hdmi *hdmi) +{ + mutex_lock(&hdmi->audio_mutex); + + if (hdmi->audio_enable) { + hdmi->audio_enable = false; + dw_dw_hdmi_audio_clk_disable(hdmi); + } + + mutex_unlock(&hdmi->audio_mutex); +} + /* HDMI Initialization Step B.4 */ static void dw_hdmi_enable_video_path(struct dw_hdmi *hdmi) { @@ -1275,11 +1328,6 @@ static void dw_hdmi_enable_video_path(struct dw_hdmi *hdmi) } } -static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi) -{ - hdmi_modb(hdmi, 0, HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS); -} - /* Workaround to clear the overflow condition */ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) { @@ -1375,7 +1423,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) /* HDMI Initialization Step E - Configure audio */ hdmi_clk_regenerator_update_pixel_clock(hdmi); - hdmi_enable_audio_clk(hdmi); + dw_hdmi_audio_restore(hdmi); /* HDMI Initialization Step F - Configure AVI InfoFrame */ hdmi_config_AVI(hdmi); @@ -1770,6 +1818,8 @@ int dw_hdmi_bind(struct device *dev, struct device *master, hdmi->sample_rate = 48000; hdmi->ratio = 100; hdmi->encoder = encoder; + hdmi->audio_enable = false; + mutex_init(&hdmi->audio_mutex); of_property_read_u32(np, "reg-io-width", &val);