From: CK Hu <ck.hu@mediatek.com>
To: Tzung-Bi Shih <tzungbi@google.com>
Cc: alsa-devel@alsa-project.org, cychiang@google.com,
airlied@linux.ie, dri-devel@lists.freedesktop.org,
broonie@kernel.org, linux-mediatek@lists.infradead.org,
daniel@ffwll.ch, matthias.bgg@gmail.com, p.zabel@pengutronix.de,
dgreid@google.com, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 2/3] drm/mediatek: support HDMI jack status reporting
Date: Wed, 12 Feb 2020 16:19:14 +0800 [thread overview]
Message-ID: <1581495554.22603.2.camel@mtksdaap41> (raw)
In-Reply-To: <20200206102509.2.I230fd59de28e73934a91cb01424e25b9e84727f4@changeid>
Hi, Tzung-Bi:
On Thu, 2020-02-06 at 11:17 +0800, Tzung-Bi Shih wrote:
> 1.
> Provides a callback (i.e. mtk_hdmi_audio_hook_plugged_cb) to hdmi-codec.
> When ASoC machine driver calls hdmi_codec_set_jack_detect(), the
> callback will be invoked to save plugged_cb and codec_dev parameters.
>
> +---------+ set_jack_ +------------+ plugged_cb +----------+
> | machine | ----------> | hdmi-codec | ----------> | mtk-hdmi |
> +---------+ detect() +------------+ codec_dev +----------+
>
> 2.
> When there is any jack status changes, mtk-hdmi will call the
> plugged_cb() to notify hdmi-codec. And then hdmi-codec will call
> snd_soc_jack_report().
>
> +----------+ plugged_cb +------------+
> | mtk-hdmi | ----------> | hdmi-codec | -> snd_soc_jack_report()
> +----------+ codec_dev +------------+
> connector_status
>
> Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 34 ++++++++++++++++++++++++++---
> 1 file changed, 31 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 23c2b0e8693d..fccdd975947d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -169,6 +169,8 @@ struct mtk_hdmi {
> bool audio_enable;
> bool powered;
> bool enabled;
> + hdmi_codec_plugged_cb plugged_cb;
> + struct device *codec_dev;
> };
>
> static inline struct mtk_hdmi *hdmi_ctx_from_bridge(struct drm_bridge *b)
> @@ -1194,13 +1196,23 @@ static void mtk_hdmi_clk_disable_audio(struct mtk_hdmi *hdmi)
> clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_AUD_SPDIF]);
> }
>
> +static enum drm_connector_status
> +mtk_hdmi_update_plugged_status(struct mtk_hdmi *hdmi)
> +{
> + bool connected = mtk_cec_hpd_high(hdmi->cec_dev);
> +
> + if (hdmi->plugged_cb && hdmi->codec_dev)
> + hdmi->plugged_cb(hdmi->codec_dev, connected);
> +
> + return connected ?
> + connector_status_connected : connector_status_disconnected;
> +}
> +
> static enum drm_connector_status hdmi_conn_detect(struct drm_connector *conn,
> bool force)
> {
> struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
> -
> - return mtk_cec_hpd_high(hdmi->cec_dev) ?
> - connector_status_connected : connector_status_disconnected;
> + return mtk_hdmi_update_plugged_status(hdmi);
> }
>
> static void hdmi_conn_destroy(struct drm_connector *conn)
> @@ -1648,20 +1660,36 @@ static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf,
> return 0;
> }
>
> +static int mtk_hdmi_audio_hook_plugged_cb(struct device *dev, void *data,
> + hdmi_codec_plugged_cb fn,
> + struct device *codec_dev)
> +{
> + struct mtk_hdmi *hdmi = data;
> +
> + hdmi->plugged_cb = fn;
> + hdmi->codec_dev = codec_dev;
> + mtk_hdmi_update_plugged_status(hdmi);
I think hdmi_conn_detect() and mtk_hdmi_audio_hook_plugged_cb() would be
called in different thread. So it's necessary to use a mutex to protect
this.
Regards,
CK
> +
> + return 0;
> +}
> +
> static const struct hdmi_codec_ops mtk_hdmi_audio_codec_ops = {
> .hw_params = mtk_hdmi_audio_hw_params,
> .audio_startup = mtk_hdmi_audio_startup,
> .audio_shutdown = mtk_hdmi_audio_shutdown,
> .digital_mute = mtk_hdmi_audio_digital_mute,
> .get_eld = mtk_hdmi_audio_get_eld,
> + .hook_plugged_cb = mtk_hdmi_audio_hook_plugged_cb,
> };
>
> static int mtk_hdmi_register_audio_driver(struct device *dev)
> {
> + struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
> struct hdmi_codec_pdata codec_data = {
> .ops = &mtk_hdmi_audio_codec_ops,
> .max_i2s_channels = 2,
> .i2s = 1,
> + .data = hdmi,
> };
> struct platform_device *pdev;
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-02-12 8:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 3:17 [PATCH v2 0/3] ASoC: mediatek: mt8173-rt5650: HDMI jack reporting Tzung-Bi Shih
2020-02-06 3:17 ` [PATCH v2 1/3] drm/mediatek: exit earlier if failed to register audio driver Tzung-Bi Shih
2020-02-07 9:34 ` CK Hu
2020-02-11 15:48 ` Applied "drm/mediatek: exit earlier if failed to register audio driver" to the asoc tree Mark Brown
2020-02-06 3:17 ` [PATCH v2 2/3] drm/mediatek: support HDMI jack status reporting Tzung-Bi Shih
2020-02-11 15:48 ` Applied "drm/mediatek: support HDMI jack status reporting" to the asoc tree Mark Brown
2020-02-12 8:19 ` CK Hu [this message]
2020-02-12 11:31 ` [PATCH v2 2/3] drm/mediatek: support HDMI jack status reporting Tzung-Bi Shih
2020-02-13 1:57 ` CK Hu
2020-02-13 8:02 ` Tzung-Bi Shih
2020-02-06 3:17 ` [PATCH v2 3/3] ASoC: mediatek: mt8173-rt5650: support HDMI jack reporting Tzung-Bi Shih
2020-02-11 15:49 ` Applied "ASoC: mediatek: mt8173-rt5650: support HDMI jack reporting" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1581495554.22603.2.camel@mtksdaap41 \
--to=ck.hu@mediatek.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cychiang@google.com \
--cc=daniel@ffwll.ch \
--cc=dgreid@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=tzungbi@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).