Merge tag 'drm-misc-next-2019-10-09-2' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 03b1409..0a6846c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2809,8 +2809,9 @@ intel_hdmi_connector_register(struct drm_connector *connector)
 
 static void intel_hdmi_destroy(struct drm_connector *connector)
 {
-       if (intel_attached_hdmi(connector)->cec_notifier)
-               cec_notifier_put(intel_attached_hdmi(connector)->cec_notifier);
+       struct cec_notifier *n = intel_attached_hdmi(connector)->cec_notifier;
+
+       cec_notifier_conn_unregister(n);
 
        intel_connector_destroy(connector);
 }
@@ -3125,6 +3126,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
        struct drm_device *dev = intel_encoder->base.dev;
        struct drm_i915_private *dev_priv = to_i915(dev);
        enum port port = intel_encoder->port;
+       struct cec_connector_info conn_info;
 
        DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
                      intel_encoder->base.base.id, intel_encoder->base.name);
@@ -3178,8 +3180,11 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
        }
 
-       intel_hdmi->cec_notifier = cec_notifier_get_conn(dev->dev,
-                                                        port_identifier(port));
+       cec_fill_conn_info_from_drm(&conn_info, connector);
+
+       intel_hdmi->cec_notifier =
+               cec_notifier_conn_register(dev->dev, port_identifier(port),
+                                          &conn_info);
        if (!intel_hdmi->cec_notifier)
                DRM_DEBUG_KMS("CEC notifier get failed\n");
 }