From: Dariusz Marcinkiewicz <darekm@google.com>
To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org,
hverkuil-cisco@xs4all.nl
Cc: Dariusz Marcinkiewicz <darekm@google.com>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>,
Vincent Abriou <vincent.abriou@st.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
linux-kernel@vger.kernel.org
Subject: [PATCH v7 6/9] drm: sti: use cec_notifier_conn_(un)register
Date: Wed, 14 Aug 2019 12:45:04 +0200 [thread overview]
Message-ID: <20190814104520.6001-7-darekm@google.com> (raw)
In-Reply-To: <20190814104520.6001-1-darekm@google.com>
Use the new cec_notifier_conn_(un)register() functions to
(un)register the notifier for the HDMI connector, and fill
in the cec_connector_info.
Changes since v2:
Don't invalidate physical address before unregistering the
notifier.
Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com>
---
drivers/gpu/drm/sti/sti_hdmi.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 9862c322f0c4a..bd15902b825ad 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1256,6 +1256,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
struct drm_device *drm_dev = data;
struct drm_encoder *encoder;
struct sti_hdmi_connector *connector;
+ struct cec_connector_info conn_info;
struct drm_connector *drm_connector;
struct drm_bridge *bridge;
int err;
@@ -1318,6 +1319,14 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
goto err_sysfs;
}
+ cec_fill_conn_info_from_drm(&conn_info, drm_connector);
+ hdmi->notifier = cec_notifier_conn_register(&hdmi->dev, NULL,
+ &conn_info);
+ if (!hdmi->notifier) {
+ hdmi->drm_connector = NULL;
+ return -ENOMEM;
+ }
+
/* Enable default interrupts */
hdmi_write(hdmi, HDMI_DEFAULT_INT, HDMI_INT_EN);
@@ -1331,6 +1340,9 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
static void sti_hdmi_unbind(struct device *dev,
struct device *master, void *data)
{
+ struct sti_hdmi *hdmi = dev_get_drvdata(dev);
+
+ cec_notifier_conn_unregister(hdmi->notifier);
}
static const struct component_ops sti_hdmi_ops = {
@@ -1436,10 +1448,6 @@ static int sti_hdmi_probe(struct platform_device *pdev)
goto release_adapter;
}
- hdmi->notifier = cec_notifier_get(&pdev->dev);
- if (!hdmi->notifier)
- goto release_adapter;
-
hdmi->reset = devm_reset_control_get(dev, "hdmi");
/* Take hdmi out of reset */
if (!IS_ERR(hdmi->reset))
@@ -1459,14 +1467,11 @@ static int sti_hdmi_remove(struct platform_device *pdev)
{
struct sti_hdmi *hdmi = dev_get_drvdata(&pdev->dev);
- cec_notifier_set_phys_addr(hdmi->notifier, CEC_PHYS_ADDR_INVALID);
-
i2c_put_adapter(hdmi->ddc_adapt);
if (hdmi->audio_pdev)
platform_device_unregister(hdmi->audio_pdev);
component_del(&pdev->dev, &sti_hdmi_ops);
- cec_notifier_put(hdmi->notifier);
return 0;
}
--
2.23.0.rc1.153.gdeed80330f-goog
next prev parent reply other threads:[~2019-08-14 10:46 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 10:44 [PATCH v7 0/9] drm: cec: convert DRM drivers to the new notifier API Dariusz Marcinkiewicz
2019-08-14 10:44 ` [PATCH v7 1/9] drm_dp_cec: add connector info support Dariusz Marcinkiewicz
2019-08-15 18:10 ` Lyude Paul
2019-08-26 9:05 ` Ben Skeggs
2019-08-22 8:08 ` Hans Verkuil
2019-08-26 9:00 ` Hans Verkuil
2019-08-28 15:05 ` Ville Syrjälä
2019-08-14 10:45 ` [PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register Dariusz Marcinkiewicz
2019-08-22 8:03 ` Hans Verkuil
2019-08-26 8:59 ` Hans Verkuil
2019-08-26 12:08 ` Ville Syrjälä
2019-08-14 10:45 ` [PATCH v7 3/9] dw-hdmi-cec: use cec_notifier_cec_adap_(un)register Dariusz Marcinkiewicz
2019-08-19 14:35 ` Neil Armstrong
2019-08-20 7:48 ` Neil Armstrong
2019-08-14 10:45 ` [PATCH v7 4/9] tda9950: " Dariusz Marcinkiewicz
2019-08-14 10:45 ` [PATCH v7 5/9] drm: tda998x: use cec_notifier_conn_(un)register Dariusz Marcinkiewicz
2019-08-19 9:30 ` Hans Verkuil
2019-08-19 11:22 ` [PATCH v7.1 " Dariusz Marcinkiewicz
2019-08-28 7:15 ` [PATCH v7.2 " Dariusz Marcinkiewicz
2019-08-25 13:12 ` [PATCH v7 " Hans Verkuil
2019-08-28 7:18 ` Dariusz Marcinkiewicz
2019-08-14 10:45 ` Dariusz Marcinkiewicz [this message]
2019-08-19 9:34 ` [PATCH v7 6/9] drm: sti: " Hans Verkuil
2019-08-22 8:11 ` Hans Verkuil
2019-09-02 13:11 ` Benjamin Gaignard
2019-08-14 10:45 ` [PATCH v7 7/9] drm: tegra: " Dariusz Marcinkiewicz
2019-08-19 9:33 ` Hans Verkuil
2019-08-28 8:09 ` Hans Verkuil
2019-08-28 9:38 ` Thierry Reding
2019-08-28 10:06 ` Hans Verkuil
2019-08-28 11:54 ` Thierry Reding
2019-10-04 8:48 ` Hans Verkuil
2019-10-14 7:51 ` Hans Verkuil
2019-08-28 9:36 ` Thierry Reding
2019-10-14 12:17 ` Thierry Reding
2019-08-14 10:45 ` [PATCH v7 8/9] drm: dw-hdmi: " Dariusz Marcinkiewicz
2019-08-19 9:32 ` Hans Verkuil
2019-08-19 14:05 ` Hans Verkuil
2019-08-19 14:38 ` Neil Armstrong
2019-08-19 14:41 ` Hans Verkuil
2019-08-19 14:47 ` Neil Armstrong
2019-08-20 7:48 ` Neil Armstrong
2019-08-14 10:45 ` [PATCH v7 9/9] drm: exynos: exynos_hdmi: " Dariusz Marcinkiewicz
2019-08-19 9:32 ` Hans Verkuil
2019-08-28 8:39 ` Sylwester Nawrocki
2019-08-28 12:34 ` [PATCH v7.1 " Dariusz Marcinkiewicz
2019-08-28 12:38 ` [PATCH v7 " Dariusz Marcinkiewicz
2019-08-19 9:38 ` [PATCH v7 0/9] drm: cec: convert DRM drivers to the new notifier API Hans Verkuil
2019-08-19 11:28 ` Dariusz Marcinkiewicz
2019-08-19 12:00 ` Hans Verkuil
2019-08-19 14:48 ` Neil Armstrong
2019-08-19 14:55 ` Hans Verkuil
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=20190814104520.6001-7-darekm@google.com \
--to=darekm@google.com \
--cc=airlied@linux.ie \
--cc=benjamin.gaignard@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=vincent.abriou@st.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).