From: Tzung-Bi Shih <tzungbi@google.com>
To: broonie@kernel.org, robh+dt@kernel.org, narmstrong@baylibre.com
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
cychiang@google.com, jonas@kwiboo.se, allen.chen@ite.com.tw,
jernej.skrabec@siol.net, dri-devel@lists.freedesktop.org,
a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com,
tzungbi@google.com, dgreid@google.com
Subject: [alsa-devel] [PATCH 5/6] drm: bridge: it6505: report connector status
Date: Tue, 22 Oct 2019 19:45:04 +0800 [thread overview]
Message-ID: <20191022193301.5.I8247fd099947a7a67ac86479b9972ea98272f547@changeid> (raw)
In-Reply-To: <20191022114505.196852-1-tzungbi@google.com>
When a connector connected or disconnected, report the jack status.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
drivers/gpu/drm/bridge/ite-it6505.c | 39 +++++++++++++++++++++++++++--
1 file changed, 37 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
index 1d19184d2056..645d7947acc2 100644
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -180,6 +180,10 @@ struct it6505 {
bool powered;
/* it6505 driver hold option */
unsigned int drv_hold;
+
+ hdmi_codec_plugged_cb plugged_cb;
+ struct device *codec_dev;
+ enum drm_connector_status last_connector_status;
};
static const struct regmap_range it6505_bridge_volatile_ranges[] = {
@@ -882,15 +886,31 @@ static const struct drm_connector_helper_funcs it6505_connector_helper_funcs = {
.get_modes = it6505_get_modes,
};
+static void it6505_update_plugged_status(struct it6505 *it6505,
+ enum drm_connector_status status)
+{
+ if (it6505->plugged_cb && it6505->codec_dev)
+ it6505->plugged_cb(it6505->codec_dev,
+ status == connector_status_connected);
+}
+
static enum drm_connector_status it6505_detect(struct drm_connector *connector,
bool force)
{
struct it6505 *it6505 = connector_to_it6505(connector);
+ enum drm_connector_status status;
if (gpiod_get_value(it6505->pdata.gpiod_hpd))
- return connector_status_disconnected;
+ status = connector_status_disconnected;
+ else
+ status = connector_status_connected;
+
+ if (status != it6505->last_connector_status) {
+ it6505->last_connector_status = status;
+ it6505_update_plugged_status(it6505, status);
+ }
- return connector_status_connected;
+ return status;
}
static const struct drm_connector_funcs it6505_connector_funcs = {
@@ -1341,10 +1361,23 @@ static void it6505_audio_shutdown(struct device *dev, void *data)
it6505->en_audio = 0;
}
+static int it6505_audio_hook_plugged_cb(struct device *dev, void *data,
+ hdmi_codec_plugged_cb fn,
+ struct device *codec_dev)
+{
+ struct it6505 *it6505 = data;
+
+ it6505->plugged_cb = fn;
+ it6505->codec_dev = codec_dev;
+ it6505_update_plugged_status(it6505, it6505->last_connector_status);
+ return 0;
+}
+
static const struct hdmi_codec_ops it6505_audio_codec_ops = {
.hw_params = it6505_audio_hw_params,
.trigger = it6505_audio_trigger,
.audio_shutdown = it6505_audio_shutdown,
+ .hook_plugged_cb = it6505_audio_hook_plugged_cb,
};
static int it6505_register_audio_driver(struct device *dev)
@@ -1354,6 +1387,7 @@ static int it6505_register_audio_driver(struct device *dev)
.ops = &it6505_audio_codec_ops,
.max_i2s_channels = 8,
.i2s = 1,
+ .data = it6505,
};
struct platform_device *pdev;
@@ -1364,6 +1398,7 @@ static int it6505_register_audio_driver(struct device *dev)
return PTR_ERR(pdev);
INIT_DELAYED_WORK(&it6505->delayed_audio, it6505_delayed_audio);
+ it6505->last_connector_status = connector_status_disconnected;
DRM_DEV_DEBUG_DRIVER(dev, "bound to %s", HDMI_CODEC_DRV_NAME);
return 0;
--
2.23.0.866.gb869b98d4c-goog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-10-22 11:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 11:44 [alsa-devel] [PATCH 0/6] ASoC: mediatek: mt8183: support DP audio Tzung-Bi Shih
2019-10-22 11:45 ` [alsa-devel] [PATCH 1/6] ASoC: hdmi-codec: add PCM trigger operator Tzung-Bi Shih
2022-11-24 5:52 ` Allen-KH Cheng (程冠勳)
2022-11-24 9:54 ` Tzung-Bi Shih
2019-10-22 11:45 ` [alsa-devel] [PATCH 2/6] drm: bridge: it6505: bridge to hdmi-codec Tzung-Bi Shih
2019-10-22 11:45 ` [alsa-devel] [PATCH 3/6] ASoC: dt-bindings: mt8183: add a property "mediatek, hdmi-codec" Tzung-Bi Shih
2019-10-29 16:57 ` Rob Herring
2019-10-22 11:45 ` [alsa-devel] [PATCH 4/6] ASoC: mediatek: mt8183: use hdmi-codec Tzung-Bi Shih
2019-10-22 11:45 ` Tzung-Bi Shih [this message]
2019-10-22 11:45 ` [alsa-devel] [PATCH 6/6] ASoC: mediatek: mt8183: support HDMI jack reporting Tzung-Bi Shih
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=20191022193301.5.I8247fd099947a7a67ac86479b9972ea98272f547@changeid \
--to=tzungbi@google.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=allen.chen@ite.com.tw \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cychiang@google.com \
--cc=devicetree@vger.kernel.org \
--cc=dgreid@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=narmstrong@baylibre.com \
--cc=robh+dt@kernel.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).