From: Cheng-Yi Chiang <cychiang@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Takashi Iwai <tiwai@suse.com>, Jaroslav Kysela <perex@perex.cz>,
Russell King <rmk+kernel@armlinux.org.uk>,
Andrzej Hajda <a.hajda@samsung.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Rob Herring <robh+dt@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
dianders@chromium.org, dgreid@chromium.org, tzungbi@chromium.org,
linux-media@vger.kernel.org, alsa-devel@alsa-project.org,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
Cheng-Yi Chiang <cychiang@chromium.org>
Subject: [PATCH 3/7] drm/bridge/synopsys: dw-hdmi: Add HDMI notifier support
Date: Mon, 3 Jun 2019 12:32:47 +0800 [thread overview]
Message-ID: <20190603043251.226549-4-cychiang@chromium.org> (raw)
In-Reply-To: <20190603043251.226549-1-cychiang@chromium.org>
Use hdmi-notifier to notify codec driver that there is HDMI plug/unplug
event.
Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org>
---
drivers/gpu/drm/bridge/synopsys/Kconfig | 1 +
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 28 +++++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig
index 3cc53b44186e..43192d9d7357 100644
--- a/drivers/gpu/drm/bridge/synopsys/Kconfig
+++ b/drivers/gpu/drm/bridge/synopsys/Kconfig
@@ -3,6 +3,7 @@ config DRM_DW_HDMI
select DRM_KMS_HELPER
select REGMAP_MMIO
select CEC_CORE if CEC_NOTIFIER
+ select HDMI_NOTIFIERS
config DRM_DW_HDMI_AHB_AUDIO
tristate "Synopsys Designware AHB Audio interface"
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index ab7968c8f6a2..53701921eb1f 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -17,6 +17,7 @@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/hdmi.h>
+#include <linux/hdmi-notifier.h>
#include <linux/mutex.h>
#include <linux/of_device.h>
#include <linux/regmap.h>
@@ -190,6 +191,7 @@ struct dw_hdmi {
void (*disable_audio)(struct dw_hdmi *hdmi);
struct cec_notifier *cec_notifier;
+ struct hdmi_notifier *hdmi_notifier;
};
#define HDMI_IH_PHY_STAT0_RX_SENSE \
@@ -2301,8 +2303,15 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
}
if (intr_stat & HDMI_IH_PHY_STAT0_HPD) {
- dev_dbg(hdmi->dev, "EVENT=%s\n",
- phy_int_pol & HDMI_PHY_HPD ? "plugin" : "plugout");
+ if (phy_int_pol & HDMI_PHY_HPD) {
+ dev_dbg(hdmi->dev, "EVENT=plugin\n");
+ if (hdmi->hdmi_notifier)
+ hdmi_event_connect(hdmi->hdmi_notifier);
+ } else {
+ dev_dbg(hdmi->dev, "EVENT=plugout\n");
+ if (hdmi->hdmi_notifier)
+ hdmi_event_disconnect(hdmi->hdmi_notifier);
+ }
if (hdmi->bridge.dev)
drm_helper_hpd_irq_event(hdmi->bridge.dev);
}
@@ -2606,6 +2615,12 @@ __dw_hdmi_probe(struct platform_device *pdev,
goto err_iahb;
}
+ hdmi->hdmi_notifier = hdmi_notifier_get(dev);
+ if (!hdmi->hdmi_notifier) {
+ ret = -ENOMEM;
+ goto err_iahb;
+ }
+
/*
* To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator
* N and cts values before enabling phy
@@ -2696,6 +2711,9 @@ __dw_hdmi_probe(struct platform_device *pdev,
if (hdmi->cec_notifier)
cec_notifier_put(hdmi->cec_notifier);
+ if (hdmi->hdmi_notifier)
+ hdmi_notifier_put(hdmi->hdmi_notifier);
+
clk_disable_unprepare(hdmi->iahb_clk);
if (hdmi->cec_clk)
clk_disable_unprepare(hdmi->cec_clk);
@@ -2709,6 +2727,9 @@ __dw_hdmi_probe(struct platform_device *pdev,
static void __dw_hdmi_remove(struct dw_hdmi *hdmi)
{
+ if (hdmi->hdmi_notifier)
+ hdmi_event_disconnect(hdmi->hdmi_notifier);
+
if (hdmi->audio && !IS_ERR(hdmi->audio))
platform_device_unregister(hdmi->audio);
if (!IS_ERR(hdmi->cec))
@@ -2720,6 +2741,9 @@ static void __dw_hdmi_remove(struct dw_hdmi *hdmi)
if (hdmi->cec_notifier)
cec_notifier_put(hdmi->cec_notifier);
+ if (hdmi->hdmi_notifier)
+ hdmi_notifier_put(hdmi->hdmi_notifier);
+
clk_disable_unprepare(hdmi->iahb_clk);
clk_disable_unprepare(hdmi->isfr_clk);
if (hdmi->cec_clk)
--
2.22.0.rc1.257.g3120a18244-goog
next prev parent reply other threads:[~2019-06-03 4:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 4:32 [PATCH 0/7] Add HDMI audio support on RK3288 veyron board Cheng-Yi Chiang
2019-06-03 4:32 ` [PATCH 1/7] video: add HDMI state notifier support Cheng-Yi Chiang
2019-06-03 7:45 ` Hans Verkuil
2019-06-03 8:09 ` Daniel Vetter
2019-06-03 9:05 ` Hans Verkuil
2019-06-04 7:19 ` Daniel Vetter
2019-06-04 2:32 ` Cheng-yi Chiang
2019-06-04 7:24 ` Daniel Vetter
2019-06-11 12:10 ` Cheng-yi Chiang
2019-06-11 12:34 ` Daniel Vetter
2019-06-18 11:48 ` Cheng-yi Chiang
2019-06-18 12:12 ` Daniel Vetter
2019-06-19 11:48 ` Cheng-yi Chiang
2019-06-20 9:25 ` Daniel Vetter
2019-06-20 13:23 ` Cheng-yi Chiang
2019-06-20 21:12 ` Daniel Vetter
2019-06-21 9:39 ` Cheng-yi Chiang
2019-06-11 13:10 ` Hans Verkuil
2019-06-18 11:54 ` Cheng-yi Chiang
2019-06-04 1:48 ` Cheng-yi Chiang
2019-06-03 4:32 ` [PATCH 2/7] ASoC: hdmi-codec: use HDMI state notifier to add jack support Cheng-Yi Chiang
2019-06-03 8:03 ` [alsa-devel] " Amadeusz Sławiński
2019-06-03 8:53 ` Cheng-yi Chiang
2019-06-03 4:32 ` Cheng-Yi Chiang [this message]
2019-06-03 4:32 ` [PATCH 4/7] ASoC: rockchip_max98090: Add dai_link for HDMI Cheng-Yi Chiang
2019-06-03 4:32 ` [PATCH 5/7] ASoC: rockchip: rockchip-max98090: Add node " Cheng-Yi Chiang
2019-07-09 20:01 ` Rob Herring
2019-07-10 4:11 ` Cheng-yi Chiang
2019-06-03 4:32 ` [PATCH 6/7] ASoC: rockchip_max98090: Add HDMI jack support Cheng-Yi Chiang
2019-06-03 4:32 ` [PATCH 7/7] ARM: dts: rockchip: Specify HDMI node to sound card node Cheng-Yi Chiang
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=20190603043251.226549-4-cychiang@chromium.org \
--to=cychiang@chromium.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=b.zolnierkie@samsung.com \
--cc=broonie@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dgreid@chromium.org \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=hverkuil@xs4all.nl \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
--cc=perex@perex.cz \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=tiwai@suse.com \
--cc=tzungbi@chromium.org \
/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).