aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-01-27 16:23:00 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-10-07 14:03:25 +0200
commitf9ff6e5b60d9b7f4c6f8a9c929e8758ee01495ed (patch)
treea47eb7c9a4fe1b7080a10d26f48764bb50f4c897
parent2acb2f58c0a2a040d04e2f6ac613385ef42338e0 (diff)
drm/sti: remove cec_notifiercec-s-conn
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--drivers/gpu/drm/sti/sti_hdmi.c22
-rw-r--r--drivers/gpu/drm/sti/sti_hdmi.h4
2 files changed, 1 insertions, 25 deletions
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 38a558768e53..a27fbfdaa95a 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -775,8 +775,6 @@ static void sti_hdmi_disable(struct drm_bridge *bridge)
clk_disable_unprepare(hdmi->clk_pix);
hdmi->enabled = false;
-
- cec_notifier_set_phys_addr(hdmi->notifier, CEC_PHYS_ADDR_INVALID);
}
/**
@@ -982,7 +980,6 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
DRM_DEBUG_KMS("%s : %dx%d cm\n",
(hdmi->hdmi_monitor ? "hdmi monitor" : "dvi monitor"),
edid->width_cm, edid->height_cm);
- cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
count = drm_add_edid_modes(connector, edid);
drm_connector_update_edid_property(connector, edid);
@@ -1044,7 +1041,6 @@ sti_hdmi_connector_detect(struct drm_connector *connector, bool force)
}
DRM_DEBUG_DRIVER("hdmi cable disconnected\n");
- cec_notifier_set_phys_addr(hdmi->notifier, CEC_PHYS_ADDR_INVALID);
return connector_status_disconnected;
}
@@ -1256,7 +1252,6 @@ 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;
@@ -1319,13 +1314,7 @@ 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;
- }
+ drm_connector->cec_hdmi_dev = &hdmi->dev;
/* Enable default interrupts */
hdmi_write(hdmi, HDMI_DEFAULT_INT, HDMI_INT_EN);
@@ -1337,17 +1326,8 @@ err_sysfs:
return -EINVAL;
}
-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 = {
.bind = sti_hdmi_bind,
- .unbind = sti_hdmi_unbind,
};
static const struct of_device_id hdmi_of_match[] = {
diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h
index 1f6dc90b5d83..75bdf29b7015 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.h
+++ b/drivers/gpu/drm/sti/sti_hdmi.h
@@ -10,8 +10,6 @@
#include <linux/hdmi.h>
#include <linux/platform_device.h>
-#include <media/cec-notifier.h>
-
#include <drm/drm_modes.h>
#include <drm/drm_property.h>
@@ -67,7 +65,6 @@ static const struct drm_prop_enum_list colorspace_mode_names[] = {
* @audio_pdev: ASoC hdmi-codec platform device
* @audio: hdmi audio parameters.
* @drm_connector: hdmi connector
- * @notifier: hotplug detect notifier
*/
struct sti_hdmi {
struct device dev;
@@ -93,7 +90,6 @@ struct sti_hdmi {
struct platform_device *audio_pdev;
struct hdmi_audio_params audio;
struct drm_connector *drm_connector;
- struct cec_notifier *notifier;
};
u32 hdmi_read(struct sti_hdmi *hdmi, int offset);

Privacy Policy