From: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
To: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org
Cc: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>,
Koro Chen <koro.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>,
Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>,
Russell King - ARM Linux
<linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>,
Liam Girdwood <lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Jyri Sarha <jsarha-l0cyMroinI0@public.gmane.org>,
Cawa Cheng <cawa.cheng-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Hans Verkuil
<hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
PC Liao <pc.liao-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>,
Matthias Brugger
<matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH v8 5/5] drm/mediatek: hdmi: issue notifications
Date: Thu, 11 Aug 2016 11:20:27 +0200 [thread overview]
Message-ID: <1470907227-899-6-git-send-email-p.zabel@pengutronix.de> (raw)
In-Reply-To: <1470907227-899-1-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Issue hot-plug detection, EDID update, and ELD update notifications
from the CEC and HDMI drivers.
Signed-off-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
drivers/gpu/drm/mediatek/mtk_cec.c | 11 +++++++++++
drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 +++
2 files changed, 14 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c
index 7a3eb8c..f78a73c 100644
--- a/drivers/gpu/drm/mediatek/mtk_cec.c
+++ b/drivers/gpu/drm/mediatek/mtk_cec.c
@@ -13,6 +13,7 @@
*/
#include <linux/clk.h>
#include <linux/delay.h>
+#include <linux/hdmi-notifier.h>
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
@@ -105,6 +106,12 @@ void mtk_cec_set_hpd_event(struct device *dev,
cec->hdmi_dev = hdmi_dev;
cec->hpd_event = hpd_event;
spin_unlock_irqrestore(&cec->lock, flags);
+
+ /* Initial notification event to set jack state */
+ if (mtk_cec_hpd_high(dev))
+ hdmi_event_connect(hdmi_dev);
+ else
+ hdmi_event_disconnect(hdmi_dev);
}
bool mtk_cec_hpd_high(struct device *dev)
@@ -179,6 +186,10 @@ static irqreturn_t mtk_cec_htplg_isr_thread(int irq, void *arg)
if (cec->hpd != hpd) {
dev_dbg(dev, "hotplug event! cur hpd = %d, hpd = %d\n",
cec->hpd, hpd);
+ if (hpd)
+ hdmi_event_connect(cec->hdmi_dev);
+ else
+ hdmi_event_disconnect(cec->hdmi_dev);
cec->hpd = hpd;
mtk_cec_hpd_event(cec, hpd);
}
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 334562d..478aa73 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -20,6 +20,7 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/hdmi.h>
+#include <linux/hdmi-notifier.h>
#include <linux/i2c.h>
#include <linux/io.h>
#include <linux/kernel.h>
@@ -1225,9 +1226,11 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
drm_mode_connector_update_edid_property(conn, edid);
+ hdmi_event_new_edid(hdmi->dev, edid, sizeof(*edid));
ret = drm_add_edid_modes(conn, edid);
drm_edid_to_eld(conn, edid);
+ hdmi_event_new_eld(hdmi->dev, conn->eld);
kfree(edid);
return ret;
}
--
2.8.1
prev parent reply other threads:[~2016-08-11 9:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 9:20 [PATCH v8 0/5] ASoC: MT8173 HDMI jack detection Philipp Zabel
2016-08-11 9:20 ` [PATCH v8 1/5] video: rmk's HDMI notification prototype Philipp Zabel
2016-08-11 10:18 ` Russell King - ARM Linux
[not found] ` <20160811101817.GT1041-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2016-08-11 14:40 ` Philipp Zabel
[not found] ` <1470907227-899-2-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-08-11 10:30 ` Hans Verkuil
2016-08-11 10:39 ` Russell King - ARM Linux
[not found] ` <20160811103929.GU1041-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2016-08-11 10:49 ` Hans Verkuil
[not found] ` <57AC5831.5050809-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
2016-08-11 14:16 ` Russell King - ARM Linux
[not found] ` <20160811141653.GV1041-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2016-08-11 14:49 ` Hans Verkuil
[not found] ` <57AC9078.2060009-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
2016-08-11 15:03 ` Russell King - ARM Linux
[not found] ` <20160811150353.GW1041-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2016-08-11 15:54 ` Hans Verkuil
[not found] ` <1470907227-899-1-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-08-11 9:20 ` [PATCH v8 2/5] ASoC: hdmi-codec: Use HDMI notifications to add jack support Philipp Zabel
[not found] ` <1470907227-899-3-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-08-15 14:23 ` Mark Brown
2016-08-11 9:20 ` [PATCH v8 3/5] ASoC: mediatek: Add jack detection support to mt8173-rt5650-rt5676 machine driver Philipp Zabel
[not found] ` <1470907227-899-4-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-08-15 14:53 ` Mark Brown
2016-08-11 9:20 ` [PATCH v8 4/5] ASoC: mediatek: Add jack detection support to the mt8173-rt5650 " Philipp Zabel
[not found] ` <1470907227-899-5-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-08-15 14:53 ` Mark Brown
2016-08-11 9:20 ` Philipp Zabel [this message]
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=1470907227-899-6-git-send-email-p.zabel@pengutronix.de \
--to=p.zabel-bicnvbalz9megne8c9+irq@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=arnaud.pouliquen-qxv4g6HH51o@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=cawa.cheng-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org \
--cc=jsarha-l0cyMroinI0@public.gmane.org \
--cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
--cc=koro.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org \
--cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
--cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=moinejf-GANU6spQydw@public.gmane.org \
--cc=pc.liao-NuS5LvNUpcJWk0Htik3J/w@public.gmane.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).