From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753584AbbAaOfK (ORCPT ); Sat, 31 Jan 2015 09:35:10 -0500 Received: from regular1.263xmail.com ([211.150.99.140]:33251 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbbAaOfI (ORCPT ); Sat, 31 Jan 2015 09:35:08 -0500 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 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: rockchip-discuss@chromium.org X-SENDER-IP: 192.253.240.227 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: <035ae709a63ffba6db03d8e974f7f37b> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <54CCE7EF.5040706@rock-chips.com> Date: Sat, 31 Jan 2015 09:34:23 -0500 From: Yang Kuankuan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Russell King - ARM Linux CC: David Airlie , Philipp Zabel , Fabio Estevam , Shawn Guo , Rob Clark , Mark Yao , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, djkurtz@chromium.org, dbehr@chromoum.org, mmind00@googlemail.com, dianders@chromium.org, marcheu@chromium.org, rockchip-discuss@chromium.org Subject: Re: [PATCH v2 08/12] drm: bridge/dw_hdmi: add audio config interfaces References: <1422617031-25098-1-git-send-email-ykk@rock-chips.com> <1422617543-25684-1-git-send-email-ykk@rock-chips.com> <20150131114806.GD26493@n2100.arm.linux.org.uk> In-Reply-To: <20150131114806.GD26493@n2100.arm.linux.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/31/2015 06:48 AM, Russell King - ARM Linux wrote: > On Fri, Jan 30, 2015 at 06:32:23AM -0500, Yakir Yang wrote: >> +static void hdmi_config_audio(struct dw_hdmi *hdmi, >> + struct hdmi_audio_fmt *aud_fmt) >> +{ >> + if (aud_fmt) >> + hdmi->aud_fmt = *aud_fmt; >> + >> + hdmi_modb(hdmi, AUDIO_CONF0_INTERFACE_II2S, >> + AUDIO_CONF0_INTERFACE_MSK, HDMI_AUD_CONF0); >> + >> + hdmi_modb(hdmi, hdmi->aud_fmt.chan_num, AUDIO_CONF0_I2SINEN_MSK, >> + HDMI_AUD_CONF0); >> + >> + hdmi_modb(hdmi, hdmi->aud_fmt.word_length, AUDIO_CONF1_DATWIDTH_MSK, >> + HDMI_AUD_CONF1); >> + >> + hdmi_modb(hdmi, hdmi->aud_fmt.dai_fmt, AUDIO_CONF1_DATAMODE_MSK, >> + HDMI_AUD_CONF1); > These registers are not defined on iMX6 SoCs, so this probably needs to be > conditionalised with the dw-hdmi IP version. okay, i will fixed what you have suggest in cover-letter first. Thanks. : ) >> +void hdmi_audio_clk_enable(struct dw_hdmi *hdmi) >> +{ >> + if (hdmi->audio_enable) >> + return; >> + >> + mutex_lock(&hdmi->audio_mutex); >> + hdmi->audio_enable = true; >> + hdmi_modb(hdmi, 0, HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS); >> + mutex_unlock(&hdmi->audio_mutex); > This is racy. The test needs to be within the mutex-protected region. This function will be called by other driver (dw-hdmi-audio), both modify the variable "hdmi->audio_enable", so i add the mutex-protected. > >> +} >> + >> +void hdmi_audio_clk_disable(struct dw_hdmi *hdmi) >> +{ >> + if (!hdmi->audio_enable) >> + return; >> + >> + mutex_lock(&hdmi->audio_mutex); >> + hdmi_modb(hdmi, HDMI_MC_CLKDIS_AUDCLK_DISABLE, >> + HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS); >> + hdmi->audio_enable = false; >> + mutex_unlock(&hdmi->audio_mutex); > Ditto. >